Messages in this thread Patch in this message | | | Date | Wed, 12 Dec 2007 22:53:27 -0800 | From | Greg KH <> | Subject | [patch 51/60] DECNET: dn_nl_deladdr() almost always returns no error |
| |
2.6.23-stable review patch. If anyone has any objections, please let us know.
------------------ From: Pavel Emelyanov <xemul@openvz.org>
[DECNET]: dn_nl_deladdr() almost always returns no error
[ Upstream commit: 3ccd86241b277249d5ac08e91eddfade47184520 ]
As far as I see from the err variable initialization the dn_nl_deladdr() routine was designed to report errors like "EADDRNOTAVAIL" and probaby "ENODEV".
But the code sets this err to 0 after the first nlmsg_parse and goes on, returning this 0 in any case.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Acked-by: Steven Whitehouse <swhiteho@redhat.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- net/decnet/dn_dev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
--- a/net/decnet/dn_dev.c +++ b/net/decnet/dn_dev.c @@ -650,16 +650,18 @@ static int dn_nl_deladdr(struct sk_buff struct dn_dev *dn_db; struct ifaddrmsg *ifm; struct dn_ifaddr *ifa, **ifap; - int err = -EADDRNOTAVAIL; + int err; err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, dn_ifa_policy); if (err < 0) goto errout; + err = -ENODEV; ifm = nlmsg_data(nlh); if ((dn_db = dn_dev_by_index(ifm->ifa_index)) == NULL) goto errout; + err = -EADDRNOTAVAIL; for (ifap = &dn_db->ifa_list; (ifa = *ifap); ifap = &ifa->ifa_next) { if (tb[IFA_LOCAL] && nla_memcmp(tb[IFA_LOCAL], &ifa->ifa_local, 2)) --
| |