net/netlink_compat: Fix a missing check of nla_parse_nested
diff mbox series

Message ID 20181224005453.9992-1-pakki001@umn.edu
State In Next
Commit 89dfd0083751d00d5d7ead36f6d8b045bf89c5e1
Headers show
Series
  • net/netlink_compat: Fix a missing check of nla_parse_nested
Related show

Commit Message

Aditya Pakki Dec. 24, 2018, 12:54 a.m. UTC
In tipc_nl_compat_sk_dump(), if nla_parse_nested() fails, it could return
an error. To be consistent with other invocations of the function call,
on error, the fix passes the return value upstream.

Signed-off-by: Aditya Pakki <pakki001@umn.edu>
---
 net/tipc/netlink_compat.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Comments

David Miller Dec. 24, 2018, 10:42 p.m. UTC | #1
From: Aditya Pakki <pakki001@umn.edu>
Date: Sun, 23 Dec 2018 18:54:53 -0600

> In tipc_nl_compat_sk_dump(), if nla_parse_nested() fails, it could return
> an error. To be consistent with other invocations of the function call,
> on error, the fix passes the return value upstream.
> 
> Signed-off-by: Aditya Pakki <pakki001@umn.edu>

Applied, thanks.

Patch
diff mbox series

diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c
index 6376467e78f8..21f6ccc89401 100644
--- a/net/tipc/netlink_compat.c
+++ b/net/tipc/netlink_compat.c
@@ -951,8 +951,11 @@  static int tipc_nl_compat_sk_dump(struct tipc_nl_compat_msg *msg,
 		u32 node;
 		struct nlattr *con[TIPC_NLA_CON_MAX + 1];
 
-		nla_parse_nested(con, TIPC_NLA_CON_MAX,
-				 sock[TIPC_NLA_SOCK_CON], NULL, NULL);
+		err = nla_parse_nested(con, TIPC_NLA_CON_MAX,
+				       sock[TIPC_NLA_SOCK_CON], NULL, NULL);
+
+		if (err)
+			return err;
 
 		node = nla_get_u32(con[TIPC_NLA_CON_NODE]);
 		tipc_tlv_sprintf(msg->rep, "  connected to <%u.%u.%u:%u>",