Skip to contentSkip to conversation

netlink: allow empty nested attributes

PATCH Applied Patrick McHardy 2 participants 2 messages Nov 27, 2008 – Nov 28, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

commit 57b0afc97f8249f0b4f665aa285ed89a9178ba42

Author: Patrick McHardy <[email protected]>
Date:   Thu Nov 27 13:40:31 2008 +0100

netlink: allow empty nested attributes

validate_nla() currently doesn't allow empty nested attributes. This makes userspace code unnecessarily complicated when starting and ending the nested attribute is done by generic upper level code and the inner attributes are dumped by a module.

Add a special case to accept empty nested attributes. When the nested attribute is non empty, the same checks as before are performed.

net/netlink/attr.c +6 -0
index c83fea7..56c3ce7 100644
@@ -83,6 +83,12 @@ static int validate_nla(struct nlattr *nla, int maxtype,
 		if (attrlen < NLA_ALIGN(pt->len) + NLA_HDRLEN + nla_len(nla))
 			return -ERANGE;
 		break;
+	case NLA_NESTED:
+		/* a nested attributes is allowed to be empty; if its not,
+		 * it must have a size of at least NLA_HDRLEN.
+		 */
+		if (attrlen == 0)
+			break;
 	default:
 		if (pt->len)
 			minlen = pt->len;
maintainer Applied
#1 lore raw

From: Patrick McHardy <[email protected]>
Date: Thu, 27 Nov 2008 13:57:19 +0100

Quoted 11 lines

commit 57b0afc97f8249f0b4f665aa285ed89a9178ba42

Author: Patrick McHardy <[email protected]>
Date:   Thu Nov 27 13:40:31 2008 +0100

netlink: allow empty nested attributes

validate_nla() currently doesn't allow empty nested attributes. This makes userspace code unnecessarily complicated when starting and ending the nested attribute is done by generic upper level code and the inner attributes are dumped by a module.

Quoted 4 lines

Add a special case to accept empty nested attributes. When the nested attribute is non empty, the same checks as before are performed.

Applied, thanks Patrick.