hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

netlink: Properly unbind in error conditions. 

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: 4f52090052 ("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>
This commit is contained in:
Hiroaki SHIMODA 2014-11-13 04:24:10 +09:00 committed by David S. Miller
parent cca04b2854
commit 6251edd932
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/netlink/af_netlink.c
View File

@ -1440,7 +1440,7 @@ static void netlink_unbind(int group, long unsigned int groups,
return; return;
for (undo = 0; undo < group; undo++) for (undo = 0; undo < group; undo++)
if (test_bit(group, &groups)) if (test_bit(undo, &groups))
nlk->netlink_unbind(undo); nlk->netlink_unbind(undo);
} }
@ -1492,7 +1492,7 @@ static int netlink_bind(struct socket *sock, struct sockaddr *addr,
netlink_insert(sk, net, nladdr->nl_pid) : netlink_insert(sk, net, nladdr->nl_pid) :
netlink_autobind(sock); netlink_autobind(sock);
if (err) { if (err) {
netlink_unbind(nlk->ngroups - 1, groups, nlk); netlink_unbind(nlk->ngroups, groups, nlk);
return err; return err;
} }
} }
@ -2509,6 +2509,7 @@ __netlink_kernel_create(struct net *net, int unit, struct module *module,
nl_table[unit].module = module; nl_table[unit].module = module;
if (cfg) { if (cfg) {
nl_table[unit].bind = cfg->bind; nl_table[unit].bind = cfg->bind;
nl_table[unit].unbind = cfg->unbind;
nl_table[unit].flags = cfg->flags; nl_table[unit].flags = cfg->flags;
if (cfg->compare) if (cfg->compare)
nl_table[unit].compare = cfg->compare; nl_table[unit].compare = cfg->compare;