[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20141112194454.GC28076@madcap2.tricolour.ca>
Date: Wed, 12 Nov 2014 14:44:54 -0500
From: Richard Guy Briggs <rgb@...hat.com>
To: Hiroaki SHIMODA <shimoda.hiroaki@...il.com>
Cc: davem@...emloft.net, netdev@...r.kernel.org
Subject: Re: [PATCH net] netlink: Properly unbind in error conditions.
On 14/11/13, Hiroaki SHIMODA wrote:
> 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@...il.com>
> Cc: Richard Guy Briggs <rgb@...hat.com>
> ---
> net/netlink/af_netlink.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
> index f1de72de273e..0007b8180397 100644
> --- a/net/netlink/af_netlink.c
> +++ b/net/netlink/af_netlink.c
> @@ -1440,7 +1440,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))
Nice find! (Cut-and-waste from line 1480...)
> 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_autobind(sock);
> if (err) {
> - netlink_unbind(nlk->ngroups - 1, groups, nlk);
> + netlink_unbind(nlk->ngroups, groups, nlk);
Yup, agreed.
> return err;
> }
> }
> @@ -2509,6 +2509,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;
Yup, thanks.
> nl_table[unit].flags = cfg->flags;
> if (cfg->compare)
> nl_table[unit].compare = cfg->compare;
Acked-by: Richard Guy Briggs <rgb@...hat.com>
> --
> 2.0.4
>
- RGB
--
Richard Guy Briggs <rbriggs@...hat.com>
Senior Software Engineer, Kernel Security, AMER ENG Base Operating Systems, Red Hat
Remote, Ottawa, Canada
Voice: +1.647.777.2635, Internal: (81) 32635, Alt: +1.613.693.0684x3545
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists