diff mbox series

[net-next] tipc: do sanity check payload of a netlink message

Message ID 20201215033151.76139-1-hoang.h.le@dektech.com.au
State Superseded
Headers show
Series [net-next] tipc: do sanity check payload of a netlink message | expand

Commit Message

Hoang Le Dec. 15, 2020, 3:31 a.m. UTC 
From: Hoang Le <hoang.h.le@dektech.com.au>

When we initialize nlmsghdr with no payload inside tipc_nl_compat_dumpit()
the parsing function returns -EINVAL. We fix it by making the parsing call
conditional.

Acked-by: Jon Maloy <jmaloy@redhat.com>
Signed-off-by: Hoang Le <hoang.h.le@dektech.com.au>
---
 net/tipc/netlink_compat.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

Comments

patchwork-bot+netdevbpf@kernel.org Dec. 16, 2020, 9:10 p.m. UTC | #1 
Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Tue, 15 Dec 2020 10:31:51 +0700 you wrote:
> From: Hoang Le <hoang.h.le@dektech.com.au>

> 

> When we initialize nlmsghdr with no payload inside tipc_nl_compat_dumpit()

> the parsing function returns -EINVAL. We fix it by making the parsing call

> conditional.

> 

> Acked-by: Jon Maloy <jmaloy@redhat.com>

> Signed-off-by: Hoang Le <hoang.h.le@dektech.com.au>

> 

> [...]


Here is the summary with links:
  - [net-next] tipc: do sanity check payload of a netlink message
    https://git.kernel.org/netdev/net/c/c32c928d29de

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
diff mbox series

Patch

diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c
index 82f154989418..5a1ce64039f7 100644
--- a/net/tipc/netlink_compat.c
+++ b/net/tipc/netlink_compat.c
@@ -213,12 +213,14 @@  static int __tipc_nl_compat_dumpit(struct tipc_nl_compat_cmd_dump *cmd,
 	}
 
 	info.attrs = attrbuf;
-	err = nlmsg_parse_deprecated(cb.nlh, GENL_HDRLEN, attrbuf,
-				     tipc_genl_family.maxattr,
-				     tipc_genl_family.policy, NULL);
-	if (err)
-		goto err_out;
 
+	if (nlmsg_len(cb.nlh) > 0) {
+		err = nlmsg_parse_deprecated(cb.nlh, GENL_HDRLEN, attrbuf,
+					     tipc_genl_family.maxattr,
+					     tipc_genl_family.policy, NULL);
+		if (err)
+			goto err_out;
+	}
 	do {
 		int rem;