netfilter: ctnetlink: fix NULL dereference while trying to change helper

The patch 1afc56794e03: "netfilter: nf_ct_helper: implement variable
length helper private data" from Jun 7, 2012, leads to the following
Smatch complaint:

net/netfilter/nf_conntrack_netlink.c:1231 ctnetlink_change_helper()
         error: we previously assumed 'help->helper' could be null (see line 1228)

This NULL dereference can be triggered with the following sequence:

1) attach the helper for first time when the conntrack is created.
2) remove the helper module or detach the helper from the conntrack
   via ctnetlink.
3) attach helper again (the same or different one, no matter) to the
   that existing conntrack again via ctnetlink.

This patch fixes the problem by removing the use case that allows you
to re-assign again a helper for one conntrack entry via ctnetlink since
I cannot find any practical use for it.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index ae156dff4887da2931d8746063baf7bf5f584a61..76271a1301a5d242b7f9bfa1c1bb00064cb3a9a5 100644 (file)
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -1224,19 +1224,12 @@ ctnetlink_change_helper(struct nf_conn *ct, const struct nlattr * const cda[])
                        if (helper->from_nlattr && helpinfo)
                                helper->from_nlattr(helpinfo, ct);
                        return 0;
-               }
-               if (help->helper)
+               } else
                        return -EBUSY;
-               /* need to zero data of old helper */
-               memset(help->data, 0, help->helper->data_len);
-       } else {
-               /* we cannot set a helper for an existing conntrack */
-               return -EOPNOTSUPP;
        }
 
-       rcu_assign_pointer(help->helper, helper);
-
-       return 0;
+       /* we cannot set a helper for an existing conntrack */
+       return -EOPNOTSUPP;
 }
 
 static inline int