* [PATCH] wimax/i2400m: fix calculation of index, remove sizeof
@ 2019-08-23 8:52 Colin King
2019-08-23 11:23 ` Dan Carpenter
0 siblings, 1 reply; 4+ messages in thread
From: Colin King @ 2019-08-23 8:52 UTC (permalink / raw)
To: Inaky Perez-Gonzalez, linux-wimax, David S . Miller, netdev
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
The subtraction of the two pointers is automatically scaled by the
size of the size of the object the pointers point to, so the division
by sizeof(*i2400m->barker) is incorrect. Fix this by removing the
division. Also make index an unsigned int to clean up a checkpatch
warning.
Addresses-Coverity: ("Extra sizeof expression")
Fixes: aba3792ac2d7 ("wimax/i2400m: rework bootrom initialization to be more flexible")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/net/wimax/i2400m/fw.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c
index 489cba9b284d..599a703af6eb 100644
--- a/drivers/net/wimax/i2400m/fw.c
+++ b/drivers/net/wimax/i2400m/fw.c
@@ -399,8 +399,7 @@ int i2400m_is_boot_barker(struct i2400m *i2400m,
* associated with the device. */
if (i2400m->barker
&& !memcmp(buf, i2400m->barker, sizeof(i2400m->barker->data))) {
- unsigned index = (i2400m->barker - i2400m_barker_db)
- / sizeof(*i2400m->barker);
+ unsigned int index = i2400m->barker - i2400m_barker_db;
d_printf(2, dev, "boot barker cache-confirmed #%u/%08x\n",
index, le32_to_cpu(i2400m->barker->data[0]));
return 0;
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] wimax/i2400m: fix calculation of index, remove sizeof
2019-08-23 8:52 [PATCH] wimax/i2400m: fix calculation of index, remove sizeof Colin King
@ 2019-08-23 11:23 ` Dan Carpenter
2019-08-23 11:27 ` Colin Ian King
0 siblings, 1 reply; 4+ messages in thread
From: Dan Carpenter @ 2019-08-23 11:23 UTC (permalink / raw)
To: Colin King
Cc: Inaky Perez-Gonzalez, linux-wimax, David S . Miller, netdev,
kernel-janitors, linux-kernel
On Fri, Aug 23, 2019 at 09:52:30AM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> The subtraction of the two pointers is automatically scaled by the
> size of the size of the object the pointers point to, so the division
> by sizeof(*i2400m->barker) is incorrect. Fix this by removing the
> division. Also make index an unsigned int to clean up a checkpatch
> warning.
>
> Addresses-Coverity: ("Extra sizeof expression")
> Fixes: aba3792ac2d7 ("wimax/i2400m: rework bootrom initialization to be more flexible")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> drivers/net/wimax/i2400m/fw.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c
> index 489cba9b284d..599a703af6eb 100644
> --- a/drivers/net/wimax/i2400m/fw.c
> +++ b/drivers/net/wimax/i2400m/fw.c
> @@ -399,8 +399,7 @@ int i2400m_is_boot_barker(struct i2400m *i2400m,
> * associated with the device. */
> if (i2400m->barker
> && !memcmp(buf, i2400m->barker, sizeof(i2400m->barker->data))) {
> - unsigned index = (i2400m->barker - i2400m_barker_db)
> - / sizeof(*i2400m->barker);
> + unsigned int index = i2400m->barker - i2400m_barker_db;
> d_printf(2, dev, "boot barker cache-confirmed #%u/%08x\n",
> index, le32_to_cpu(i2400m->barker->data[0]));
It's only used for this debug output. You may as well just delete it.
> return 0;
regards,
dan carpenter
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] wimax/i2400m: fix calculation of index, remove sizeof
2019-08-23 11:23 ` Dan Carpenter
@ 2019-08-23 11:27 ` Colin Ian King
2019-08-23 21:30 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Colin Ian King @ 2019-08-23 11:27 UTC (permalink / raw)
To: Dan Carpenter
Cc: Inaky Perez-Gonzalez, linux-wimax, David S . Miller, netdev,
kernel-janitors, linux-kernel
On 23/08/2019 12:23, Dan Carpenter wrote:
> On Fri, Aug 23, 2019 at 09:52:30AM +0100, Colin King wrote:
>> From: Colin Ian King <colin.king@canonical.com>
>>
>> The subtraction of the two pointers is automatically scaled by the
>> size of the size of the object the pointers point to, so the division
>> by sizeof(*i2400m->barker) is incorrect. Fix this by removing the
>> division. Also make index an unsigned int to clean up a checkpatch
>> warning.
>>
>> Addresses-Coverity: ("Extra sizeof expression")
>> Fixes: aba3792ac2d7 ("wimax/i2400m: rework bootrom initialization to be more flexible")
>> Signed-off-by: Colin Ian King <colin.king@canonical.com>
>> ---
>> drivers/net/wimax/i2400m/fw.c | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c
>> index 489cba9b284d..599a703af6eb 100644
>> --- a/drivers/net/wimax/i2400m/fw.c
>> +++ b/drivers/net/wimax/i2400m/fw.c
>> @@ -399,8 +399,7 @@ int i2400m_is_boot_barker(struct i2400m *i2400m,
>> * associated with the device. */
>> if (i2400m->barker
>> && !memcmp(buf, i2400m->barker, sizeof(i2400m->barker->data))) {
>> - unsigned index = (i2400m->barker - i2400m_barker_db)
>> - / sizeof(*i2400m->barker);
>> + unsigned int index = i2400m->barker - i2400m_barker_db;
>> d_printf(2, dev, "boot barker cache-confirmed #%u/%08x\n",
>> index, le32_to_cpu(i2400m->barker->data[0]));
>
> It's only used for this debug output. You may as well just delete it.
>
>> return 0;
Deleting wrong debug code vs fixing debug code? I'd rather go for the
latter.
>
> regards,
> dan carpenter
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] wimax/i2400m: fix calculation of index, remove sizeof
2019-08-23 11:27 ` Colin Ian King
@ 2019-08-23 21:30 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2019-08-23 21:30 UTC (permalink / raw)
To: colin.king
Cc: dan.carpenter, inaky.perez-gonzalez, linux-wimax, netdev,
kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
Date: Fri, 23 Aug 2019 12:27:00 +0100
> On 23/08/2019 12:23, Dan Carpenter wrote:
>> On Fri, Aug 23, 2019 at 09:52:30AM +0100, Colin King wrote:
>>> From: Colin Ian King <colin.king@canonical.com>
>>>
>>> The subtraction of the two pointers is automatically scaled by the
>>> size of the size of the object the pointers point to, so the division
>>> by sizeof(*i2400m->barker) is incorrect. Fix this by removing the
>>> division. Also make index an unsigned int to clean up a checkpatch
>>> warning.
>>>
>>> Addresses-Coverity: ("Extra sizeof expression")
>>> Fixes: aba3792ac2d7 ("wimax/i2400m: rework bootrom initialization to be more flexible")
>>> Signed-off-by: Colin Ian King <colin.king@canonical.com>
>>> ---
>>> drivers/net/wimax/i2400m/fw.c | 3 +--
>>> 1 file changed, 1 insertion(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c
>>> index 489cba9b284d..599a703af6eb 100644
>>> --- a/drivers/net/wimax/i2400m/fw.c
>>> +++ b/drivers/net/wimax/i2400m/fw.c
>>> @@ -399,8 +399,7 @@ int i2400m_is_boot_barker(struct i2400m *i2400m,
>>> * associated with the device. */
>>> if (i2400m->barker
>>> && !memcmp(buf, i2400m->barker, sizeof(i2400m->barker->data))) {
>>> - unsigned index = (i2400m->barker - i2400m_barker_db)
>>> - / sizeof(*i2400m->barker);
>>> + unsigned int index = i2400m->barker - i2400m_barker_db;
>>> d_printf(2, dev, "boot barker cache-confirmed #%u/%08x\n",
>>> index, le32_to_cpu(i2400m->barker->data[0]));
>>
>> It's only used for this debug output. You may as well just delete it.
>>
>>> return 0;
>
> Deleting wrong debug code vs fixing debug code? I'd rather go for the
> latter.
It's been wrong since day one, so it's been useful for absolutely nobody.
This is also an ancient driver for hardware no longer in production.
Dan is right, just remove this stuff, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-08-23 21:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-23 8:52 [PATCH] wimax/i2400m: fix calculation of index, remove sizeof Colin King
2019-08-23 11:23 ` Dan Carpenter
2019-08-23 11:27 ` Colin Ian King
2019-08-23 21:30 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).