[PATCH] ipset: fix a missing check of nla_parse

Subsystems: netfilter, networking [general], the rest

STALE2819d

4 messages, 3 authors, 2019-01-10 · open the first message on its own page

[PATCH] ipset: fix a missing check of nla_parse

From: Kangjie Lu <hidden>
Date: 2018-12-26 03:50:32

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: Kangjie Lu <redacted>
---
 net/netfilter/ipset/ip_set_core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index 1577f2f76060..4dc8057cff02 100644
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c

@@ -1531,8 +1531,10 @@ 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(cda, IPSET_ATTR_CMD_MAX, cmdattr,
+		ret = nla_parse(cda, IPSET_ATTR_CMD_MAX, cmdattr,
 			  nlh->nlmsg_len - min_len, ip_set_adt_policy, NULL);
+		if (ret)
+			return ret;
 
 		errline = nla_data(cda[IPSET_ATTR_LINENO]);

-- 
2.17.2 (Apple Git-113)

Re: [PATCH] ipset: fix a missing check of nla_parse

From: Kirill Tkhai <hidden>
Date: 2018-12-26 09:16:39

On 26.12.2018 06:50, Kangjie Lu wrote:

quoted hunk

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: Kangjie Lu <redacted>
---
 net/netfilter/ipset/ip_set_core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index 1577f2f76060..4dc8057cff02 100644
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c

@@ -1531,8 +1531,10 @@ 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(cda, IPSET_ATTR_CMD_MAX, cmdattr,
+		ret = nla_parse(cda, IPSET_ATTR_CMD_MAX, cmdattr,
 			  nlh->nlmsg_len - min_len, ip_set_adt_policy, NULL);
+		if (ret)
+			return ret;

In this function above nlmsg_new() allocates skb2, but I don't see, where you free it here.

 
 		errline = nla_data(cda[IPSET_ATTR_LINENO]);

Re: [PATCH] ipset: fix a missing check of nla_parse

From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: 2019-01-09 22:43:42

On Wed, Dec 26, 2018 at 12:16:25PM +0300, Kirill Tkhai wrote:

On 26.12.2018 06:50, Kangjie Lu wrote:

quoted

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: Kangjie Lu <redacted>
---
 net/netfilter/ipset/ip_set_core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index 1577f2f76060..4dc8057cff02 100644
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c

@@ -1531,8 +1531,10 @@ 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(cda, IPSET_ATTR_CMD_MAX, cmdattr,
+		ret = nla_parse(cda, IPSET_ATTR_CMD_MAX, cmdattr,
 			  nlh->nlmsg_len - min_len, ip_set_adt_policy, NULL);

@Kangjie: nitpick, could you align this line below? ie.

		ret = nla_parse(cda, IPSET_ATTR_CMD_MAX, cmdattr,
                                nlh->nlmsg_len - min_len, ip_set_adt_policy,
                                NULL);

quoted

+		if (ret)
+			return ret;

In this function above nlmsg_new() allocates skb2, but I don't see, where you free it here.

netlink_unicast() is responsible for releasing this skb2.

quoted

 		errline = nla_data(cda[IPSET_ATTR_LINENO]);

Re: [PATCH] ipset: fix a missing check of nla_parse

From: Kirill Tkhai <hidden>
Date: 2019-01-10 08:54:13

On 10.01.2019 01:43, Pablo Neira Ayuso wrote:

On Wed, Dec 26, 2018 at 12:16:25PM +0300, Kirill Tkhai wrote:

quoted

On 26.12.2018 06:50, Kangjie Lu wrote:

quoted

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: Kangjie Lu <redacted>
---
 net/netfilter/ipset/ip_set_core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index 1577f2f76060..4dc8057cff02 100644
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c

@@ -1531,8 +1531,10 @@ 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(cda, IPSET_ATTR_CMD_MAX, cmdattr,
+		ret = nla_parse(cda, IPSET_ATTR_CMD_MAX, cmdattr,
 			  nlh->nlmsg_len - min_len, ip_set_adt_policy, NULL);

@Kangjie: nitpick, could you align this line below? ie.

		ret = nla_parse(cda, IPSET_ATTR_CMD_MAX, cmdattr,
                                nlh->nlmsg_len - min_len, ip_set_adt_policy,
                                NULL);

quoted

+		if (ret)
+			return ret;

In this function above nlmsg_new() allocates skb2, but I don't see, where you free it here.

netlink_unicast() is responsible for releasing this skb2.

We return earlier at "if (ret)", so netlink_unicast() is not called.

quoted

 		errline = nla_data(cda[IPSET_ATTR_LINENO]);

Kirill

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help