2024-05-13 18:51:26

by Thorsten Blum

Subject: [PATCH] w1: Fix number of bytes in error message

Fix the number of bytes that failed to be allocated for a new w1 device.

Signed-off-by: Thorsten Blum <[email protected]>
---
drivers/w1/w1_int.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
index 3a71c5eb2f83..677e7167806c 100644
--- a/drivers/w1/w1_int.c
+++ b/drivers/w1/w1_int.c
@@ -34,7 +34,7 @@ static struct w1_master *w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
dev = kzalloc(sizeof(struct w1_master) + sizeof(struct w1_bus_master), GFP_KERNEL);
if (!dev) {
pr_err("Failed to allocate %zd bytes for new w1 device.\n",
- sizeof(struct w1_master));
+ sizeof(struct w1_master) + sizeof(struct w1_bus_master));
return NULL;
}

--
2.45.0

2024-05-27 12:04:28

by Krzysztof Kozlowski

Subject: Re: [PATCH] w1: Fix number of bytes in error message

On 13/05/2024 17:43, Thorsten Blum wrote:
> Fix the number of bytes that failed to be allocated for a new w1 device.
>
> Signed-off-by: Thorsten Blum <[email protected]>
> ---
> drivers/w1/w1_int.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
> index 3a71c5eb2f83..677e7167806c 100644
> --- a/drivers/w1/w1_int.c
> +++ b/drivers/w1/w1_int.c
> @@ -34,7 +34,7 @@ static struct w1_master *w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
> dev = kzalloc(sizeof(struct w1_master) + sizeof(struct w1_bus_master), GFP_KERNEL);
> if (!dev) {
> pr_err("Failed to allocate %zd bytes for new w1 device.\n",
> - sizeof(struct w1_master));
> + sizeof(struct w1_master) + sizeof(struct w1_bus_master));

No, instead error message should be dropped. Core handles printing
memory allocation failures.

Best regards,
Krzysztof

2024-05-27 14:59:39

by Thorsten Blum

Subject: Re: [PATCH] w1: Fix number of bytes in error message

On 27. May 2024, at 13:51, Krzysztof Kozlowski <[email protected]> wrote:
> On 13/05/2024 17:43, Thorsten Blum wrote:
>> Fix the number of bytes that failed to be allocated for a new w1 device.
>>
>> Signed-off-by: Thorsten Blum <[email protected]>
>> ---
>> drivers/w1/w1_int.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
>> index 3a71c5eb2f83..677e7167806c 100644
>> --- a/drivers/w1/w1_int.c
>> +++ b/drivers/w1/w1_int.c
>> @@ -34,7 +34,7 @@ static struct w1_master *w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
>> dev = kzalloc(sizeof(struct w1_master) + sizeof(struct w1_bus_master), GFP_KERNEL);
>> if (!dev) {
>> pr_err("Failed to allocate %zd bytes for new w1 device.\n",
>> - sizeof(struct w1_master));
>> + sizeof(struct w1_master) + sizeof(struct w1_bus_master));
>
> No, instead error message should be dropped. Core handles printing
> memory allocation failures.

Ok, I'll submit a v2 shortly.