]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
rtnetlink: Fix an error handling path in rtnl_newlink()
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Sat, 26 Oct 2024 14:17:44 +0000 (16:17 +0200)
committerJakub Kicinski <kuba@kernel.org>
Thu, 31 Oct 2024 01:26:58 +0000 (18:26 -0700)
When some code has been moved in the commit in Fixes, some "return err;"
have correctly been changed in goto <some_where_in_the_error_handling_path>
but this one was missed.

Should "ops->maxtype > RTNL_MAX_TYPE" happen, then some resources would
leak.

Go through the error handling path to fix these leaks.

Fixes: 0d3008d1a9ae ("rtnetlink: Move ops->validate to rtnl_newlink().")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://patch.msgid.link/eca90eeb4d9e9a0545772b68aeaab883d9fe2279.1729952228.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/core/rtnetlink.c

index b70f90b98714292d08e65f9b348b424b58f3c2ef..7b96f89333d363f359604c406e395c7dca67eb1c 100644 (file)
@@ -3840,8 +3840,10 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,
        }
 
        if (ops) {
-               if (ops->maxtype > RTNL_MAX_TYPE)
-                       return -EINVAL;
+               if (ops->maxtype > RTNL_MAX_TYPE) {
+                       ret = -EINVAL;
+                       goto put_ops;
+               }
 
                if (ops->maxtype && linkinfo[IFLA_INFO_DATA]) {
                        ret = nla_parse_nested_deprecated(tbs->attr, ops->maxtype,