[PATCH 04/26] netfilter: ipset: fix a missing check of nla_parse

[Pablo Neira Ayuso]

From: Aditya Pakki <pakki...@umn.edu>

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 <pakki...@umn.edu>
Signed-off-by: Jozsef Kadlecsik <kad...@blackhole.kfki.hu>
---
 net/netfilter/ipset/ip_set_core.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/net/netfilter/ipset/ip_set_core.c 
b/net/netfilter/ipset/ip_set_core.c
index 2ad609900b22..d0f4c627ff91 100644
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
@@ -1544,10 +1544,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;
-- 
2.11.0