[PATCH] irqchip/gic-v3: check kasprintf() for failures

[PATCH] irqchip/gic-v3: check kasprintf() for failures

[YueHaibing]

We should just return -ENOMEM here if the allocation fails,
otherwise it may cause a panic.

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 drivers/irqchip/irq-gic-v3-its-pci-msi.c      | 3 +++
 drivers/irqchip/irq-gic-v3-its-platform-msi.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/drivers/irqchip/irq-gic-v3-its-pci-msi.c b/drivers/irqchip/irq-gic-v3-its-pci-msi.c
index 25a98de..ef3911f 100644
--- a/drivers/irqchip/irq-gic-v3-its-pci-msi.c
+++ b/drivers/irqchip/irq-gic-v3-its-pci-msi.c
@@ -160,6 +160,9 @@ its_pci_msi_parse_madt(struct acpi_subtable_header *header,
 	its_entry = (struct acpi_madt_generic_translator *)header;
 	node_name = kasprintf(GFP_KERNEL, "ITS@0x%lx",
 			      (long)its_entry->base_address);
+	if(!node_name)
+		return -ENOMEM;
+
 	dom_handle = iort_find_domain_token(its_entry->translation_id);
 	if (!dom_handle) {
 		pr_err("%s: Unable to locate ITS domain handle\n", node_name);
diff --git a/drivers/irqchip/irq-gic-v3-its-platform-msi.c b/drivers/irqchip/irq-gic-v3-its-platform-msi.c
index 8881a05..b676fb4 100644
--- a/drivers/irqchip/irq-gic-v3-its-platform-msi.c
+++ b/drivers/irqchip/irq-gic-v3-its-platform-msi.c
@@ -126,6 +126,9 @@ its_pmsi_parse_madt(struct acpi_subtable_header *header,
 	its_entry = (struct acpi_madt_generic_translator *)header;
 	node_name = kasprintf(GFP_KERNEL, "ITS@0x%lx",
 			      (long)its_entry->base_address);
+	if(!node_name)
+		return -ENOMEM;
+
 	domain_handle = iort_find_domain_token(its_entry->translation_id);
 	if (!domain_handle) {
 		pr_err("%s: Unable to locate ITS domain handle\n", node_name);
-- 
2.7.0

Re: [PATCH] irqchip/gic-v3: check kasprintf() for failures

[Marc Zyngier]

On Tue, 24 Apr 2018 08:10:36 +0100,
YueHaibing wrote:
> 
> We should just return -ENOMEM here if the allocation fails,
> otherwise it may cause a panic.

Can you explain how? From what I can see, node_name is only used as a
parameter to pr_err/pr_info, which will perfectly deal with it by
printing "(null)", and not causing a panic. Am I missing something?

> 
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
>  drivers/irqchip/irq-gic-v3-its-pci-msi.c      | 3 +++
>  drivers/irqchip/irq-gic-v3-its-platform-msi.c | 3 +++
>  2 files changed, 6 insertions(+)
> 
> diff --git a/drivers/irqchip/irq-gic-v3-its-pci-msi.c b/drivers/irqchip/irq-gic-v3-its-pci-msi.c
> index 25a98de..ef3911f 100644
> --- a/drivers/irqchip/irq-gic-v3-its-pci-msi.c
> +++ b/drivers/irqchip/irq-gic-v3-its-pci-msi.c
> @@ -160,6 +160,9 @@ its_pci_msi_parse_madt(struct acpi_subtable_header *header,
>  	its_entry = (struct acpi_madt_generic_translator *)header;
>  	node_name = kasprintf(GFP_KERNEL, "ITS@0x%lx",
>  			      (long)its_entry->base_address);
> +	if(!node_name)

Missing space.

> +		return -ENOMEM;
> +
>  	dom_handle = iort_find_domain_token(its_entry->translation_id);
>  	if (!dom_handle) {
>  		pr_err("%s: Unable to locate ITS domain handle\n", node_name);
> diff --git a/drivers/irqchip/irq-gic-v3-its-platform-msi.c b/drivers/irqchip/irq-gic-v3-its-platform-msi.c
> index 8881a05..b676fb4 100644
> --- a/drivers/irqchip/irq-gic-v3-its-platform-msi.c
> +++ b/drivers/irqchip/irq-gic-v3-its-platform-msi.c
> @@ -126,6 +126,9 @@ its_pmsi_parse_madt(struct acpi_subtable_header *header,
>  	its_entry = (struct acpi_madt_generic_translator *)header;
>  	node_name = kasprintf(GFP_KERNEL, "ITS@0x%lx",
>  			      (long)its_entry->base_address);
> +	if(!node_name)
> +		return -ENOMEM;
> +
>  	domain_handle = iort_find_domain_token(its_entry->translation_id);
>  	if (!domain_handle) {
>  		pr_err("%s: Unable to locate ITS domain handle\n", node_name);
> -- 
> 2.7.0
> 
> 

Thanks,

	M.

-- 
Jazz is not dead, it just smell funny.

Re: [PATCH] irqchip/gic-v3: check kasprintf() for failures

[YueHaibing]

On 2018/4/24 15:21, Marc Zyngier wrote:
> On Tue, 24 Apr 2018 08:10:36 +0100,
> YueHaibing wrote:
>>
>> We should just return -ENOMEM here if the allocation fails,
>> otherwise it may cause a panic.
> 
> Can you explain how? From what I can see, node_name is only used as a
> parameter to pr_err/pr_info, which will perfectly deal with it by
> printing "(null)", and not causing a panic. Am I missing something?
> 
You are right

I just misunderstood,sorry for noise.

>>
>> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
>> ---
>>  drivers/irqchip/irq-gic-v3-its-pci-msi.c      | 3 +++
>>  drivers/irqchip/irq-gic-v3-its-platform-msi.c | 3 +++
>>  2 files changed, 6 insertions(+)
>>
>> diff --git a/drivers/irqchip/irq-gic-v3-its-pci-msi.c b/drivers/irqchip/irq-gic-v3-its-pci-msi.c
>> index 25a98de..ef3911f 100644
>> --- a/drivers/irqchip/irq-gic-v3-its-pci-msi.c
>> +++ b/drivers/irqchip/irq-gic-v3-its-pci-msi.c
>> @@ -160,6 +160,9 @@ its_pci_msi_parse_madt(struct acpi_subtable_header *header,
>>  	its_entry = (struct acpi_madt_generic_translator *)header;
>>  	node_name = kasprintf(GFP_KERNEL, "ITS@0x%lx",
>>  			      (long)its_entry->base_address);
>> +	if(!node_name)
> 
> Missing space.
> 
>> +		return -ENOMEM;
>> +
>>  	dom_handle = iort_find_domain_token(its_entry->translation_id);
>>  	if (!dom_handle) {
>>  		pr_err("%s: Unable to locate ITS domain handle\n", node_name);
>> diff --git a/drivers/irqchip/irq-gic-v3-its-platform-msi.c b/drivers/irqchip/irq-gic-v3-its-platform-msi.c
>> index 8881a05..b676fb4 100644
>> --- a/drivers/irqchip/irq-gic-v3-its-platform-msi.c
>> +++ b/drivers/irqchip/irq-gic-v3-its-platform-msi.c
>> @@ -126,6 +126,9 @@ its_pmsi_parse_madt(struct acpi_subtable_header *header,
>>  	its_entry = (struct acpi_madt_generic_translator *)header;
>>  	node_name = kasprintf(GFP_KERNEL, "ITS@0x%lx",
>>  			      (long)its_entry->base_address);
>> +	if(!node_name)
>> +		return -ENOMEM;
>> +
>>  	domain_handle = iort_find_domain_token(its_entry->translation_id);
>>  	if (!domain_handle) {
>>  		pr_err("%s: Unable to locate ITS domain handle\n", node_name);
>> -- 
>> 2.7.0
>>
>>
> 
> Thanks,
> 
> 	M.
>