diff options
| author | Hiroaki SHIMODA <shimoda.hiroaki@gmail.com> | 2014-11-13 04:24:10 +0900 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2014-11-27 11:21:56 +0000 |
| commit | 1b1a5bb6d0776dd9d3ffa6c23a341d4da11cb5e7 (patch) | |
| tree | 32462020e799ba90191587ed298dced58f962241 /net/netlink | |
| parent | b828096e4fa471336273a9d546efcdddb45d0d3e (diff) | |
| download | linux-stable-1b1a5bb6d0776dd9d3ffa6c23a341d4da11cb5e7.tar.gz linux-stable-1b1a5bb6d0776dd9d3ffa6c23a341d4da11cb5e7.tar.bz2 linux-stable-1b1a5bb6d0776dd9d3ffa6c23a341d4da11cb5e7.zip | |
netlink: Properly unbind in error conditions.
commit 6251edd932ce3faadbfe27b0a0fe79780e0972e9 upstream.
Even if netlink_kernel_cfg::unbind is implemented the unbind() method is
not called, because cfg->unbind is omitted in __netlink_kernel_create().
And fix wrong argument of test_bit() and off by one problem.
At this point, no unbind() method is implemented, so there is no real
issue.
Fixes: 4f520900522f ("netlink: have netlink per-protocol bind function return an error code.")
Signed-off-by: Hiroaki SHIMODA <shimoda.hiroaki@gmail.com>
Cc: Richard Guy Briggs <rgb@redhat.com>
Acked-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'net/netlink')
| -rw-r--r-- | net/netlink/af_netlink.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index d158e1c888d8..0ed3c2b65fb7 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -1491,7 +1491,7 @@ static void netlink_unbind(int group, long unsigned int groups, return; for (undo = 0; undo < group; undo++) - if (test_bit(group, &groups)) + if (test_bit(undo, &groups)) nlk->netlink_unbind(undo); } @@ -1543,7 +1543,7 @@ static int netlink_bind(struct socket *sock, struct sockaddr *addr, netlink_insert(sk, net, nladdr->nl_pid) : netlink_autobind(sock); if (err) { - netlink_unbind(nlk->ngroups - 1, groups, nlk); + netlink_unbind(nlk->ngroups, groups, nlk); return err; } } @@ -2563,6 +2563,7 @@ __netlink_kernel_create(struct net *net, int unit, struct module *module, nl_table[unit].module = module; if (cfg) { nl_table[unit].bind = cfg->bind; + nl_table[unit].unbind = cfg->unbind; nl_table[unit].flags = cfg->flags; if (cfg->compare) nl_table[unit].compare = cfg->compare; |