| Message ID | 20230825064656.87751-1-jiapeng.chong@linux.alibaba.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | can: raw: Remove NULL check before dev_{put, hold} | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Series ignored based on subject |
No need to hurry! This improvement has already been reported by Simon Horman, see this discussion: https://lore.kernel.org/linux-can/20230822200804.GC3523530@kernel.org/ Reported-by: Simon Horman <horms@kernel.org> Acked-by: Oliver Hartkopp <socketcan@hartkopp.net> @Marc Kleine-Budde: Can you please take this patch via can-next tree? Thanks, Oliver On 25.08.23 08:46, Jiapeng Chong wrote: > The call netdev_{put, hold} of dev_{put, hold} will check NULL, so there > is no need to check before using dev_{put, hold}, remove it to silence > the warning: > > ./net/can/raw.c:497:2-9: WARNING: NULL check before dev_{put, hold} functions is not needed. > > Reported-by: Abaci Robot <abaci@linux.alibaba.com> > Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=6231 > Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com> > --- > net/can/raw.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/net/can/raw.c b/net/can/raw.c > index d50c3f3d892f..ff7797c37018 100644 > --- a/net/can/raw.c > +++ b/net/can/raw.c > @@ -493,8 +493,7 @@ static int raw_bind(struct socket *sock, struct sockaddr *uaddr, int len) > > out_put_dev: > /* remove potential reference from dev_get_by_index() */ > - if (dev) > - dev_put(dev); > + dev_put(dev); > out: > release_sock(sk); > rtnl_unlock();
On 25.08.2023 14:46:56, Jiapeng Chong wrote: > The call netdev_{put, hold} of dev_{put, hold} will check NULL, so there > is no need to check before using dev_{put, hold}, remove it to silence > the warning: > > ./net/can/raw.c:497:2-9: WARNING: NULL check before dev_{put, hold} functions is not needed. > > Reported-by: Abaci Robot <abaci@linux.alibaba.com> > Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=6231 > Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com> Applied to linux-can-next/testing. regards, Marc
diff --git a/net/can/raw.c b/net/can/raw.c index d50c3f3d892f..ff7797c37018 100644 --- a/net/can/raw.c +++ b/net/can/raw.c @@ -493,8 +493,7 @@ static int raw_bind(struct socket *sock, struct sockaddr *uaddr, int len) out_put_dev: /* remove potential reference from dev_get_by_index() */ - if (dev) - dev_put(dev); + dev_put(dev); out: release_sock(sk); rtnl_unlock();
The call netdev_{put, hold} of dev_{put, hold} will check NULL, so there is no need to check before using dev_{put, hold}, remove it to silence the warning: ./net/can/raw.c:497:2-9: WARNING: NULL check before dev_{put, hold} functions is not needed. Reported-by: Abaci Robot <abaci@linux.alibaba.com> Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=6231 Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com> --- net/can/raw.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)