netfilter: ipset: fix a missing check of nla_parse

[ Upstream commit f4f5748bfec94cf418e49bf05f0c81a1b9ebc950 ]

When nla_parse fails, we should not use the results (the first
argument). The fix checks if it fails, and if so, returns its error code
upstream.

Signed-off-by: Aditya Pakki <pakki001@umn.edu>
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index 3cdf171cd4682e90a28758c30c561c9ba2a9c6fe..16afa0df4004d05fb714baac51323a79b068ae10 100644 (file)
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
@@ -1541,10 +1541,14 @@ call_ad(struct sock *ctnl, struct sk_buff *skb, struct ip_set *set,
                memcpy(&errmsg->msg, nlh, nlh->nlmsg_len);
                cmdattr = (void *)&errmsg->msg + min_len;
 
-               nla_parse_deprecated(cda, IPSET_ATTR_CMD_MAX, cmdattr,
-                                    nlh->nlmsg_len - min_len,
-                                    ip_set_adt_policy, NULL);
+               ret = nla_parse_deprecated(cda, IPSET_ATTR_CMD_MAX, cmdattr,
+                                          nlh->nlmsg_len - min_len,
+                                          ip_set_adt_policy, NULL);
 
+               if (ret) {
+                       nlmsg_free(skb2);
+                       return ret;
+               }
                errline = nla_data(cda[IPSET_ATTR_LINENO]);
 
                *errline = lineno;