| Message ID | 0f17d2f60c188554d093e820c45caf20fe53aab0.1604930005.git.geliangtang@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | fix static checker warnings in | expand |
| Context | Check | Description |
|---|---|---|
| netdev/apply | fail | Patch does not apply to net |
| netdev/tree_selection | success | Clearly marked for net |
Hi Geliang, On 09/11/2020 14:59, Geliang Tang wrote: > This patch added NULL pointer check for mptcp_pm_alloc_anno_list, and > avoided similar static checker warnings in mptcp_pm_add_timer. > > Signed-off-by: Geliang Tang <geliangtang@gmail.com> > Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> I think Dan reviewed the v1 of your patch -- without some modifications below -- but not the v2 nor this one. > --- > net/mptcp/pm_netlink.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c > index 03f2c28f11f5..dfc1bed4a55f 100644 > --- a/net/mptcp/pm_netlink.c > +++ b/net/mptcp/pm_netlink.c > @@ -266,7 +266,9 @@ static bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, > { > struct mptcp_pm_add_entry *add_entry = NULL; > struct sock *sk = (struct sock *)msk; > - struct net *net = sock_net(sk); > + > + if (!msk) > + return false; As Dan mentioned on MPTCP ML, this check is not required: "msk" cannot be NULL here. We can maybe keep the cleanup (only move sock_net() below) but I don't think we need or want this in -net. I am not even sure we want it in net-next but why not :) This could also be part of other refactors. Cheers, Matt
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 03f2c28f11f5..dfc1bed4a55f 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -266,7 +266,9 @@ static bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, { struct mptcp_pm_add_entry *add_entry = NULL; struct sock *sk = (struct sock *)msk; - struct net *net = sock_net(sk); + + if (!msk) + return false; if (lookup_anno_list_by_saddr(msk, &entry->addr)) return false; @@ -283,7 +285,7 @@ static bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, timer_setup(&add_entry->add_timer, mptcp_pm_add_timer, 0); sk_reset_timer(sk, &add_entry->add_timer, - jiffies + mptcp_get_add_addr_timeout(net)); + jiffies + mptcp_get_add_addr_timeout(sock_net(sk))); return true; }