Bläddra i källkod

[NETLINK]: introduce NLA_BINARY type

This patch introduces a new NLA_BINARY attribute policy type with the
verification of simply checking the maximum length of the payload.

It also fixes a small typo in the example.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Johannes Berg 18 år sedan
förälder
incheckning
d30045a0bc
2 ändrade filer med 8 tillägg och 1 borttagningar
  1. 3 1
      include/net/netlink.h
  2. 5 0
      net/netlink/attr.c

+ 3 - 1
include/net/netlink.h

@@ -171,6 +171,7 @@ enum {
 	NLA_MSECS,
 	NLA_MSECS,
 	NLA_NESTED,
 	NLA_NESTED,
 	NLA_NUL_STRING,
 	NLA_NUL_STRING,
+	NLA_BINARY,
 	__NLA_TYPE_MAX,
 	__NLA_TYPE_MAX,
 };
 };
 
 
@@ -188,12 +189,13 @@ enum {
  *    NLA_STRING           Maximum length of string
  *    NLA_STRING           Maximum length of string
  *    NLA_NUL_STRING       Maximum length of string (excluding NUL)
  *    NLA_NUL_STRING       Maximum length of string (excluding NUL)
  *    NLA_FLAG             Unused
  *    NLA_FLAG             Unused
+ *    NLA_BINARY           Maximum length of attribute payload
  *    All other            Exact length of attribute payload
  *    All other            Exact length of attribute payload
  *
  *
  * Example:
  * Example:
  * static struct nla_policy my_policy[ATTR_MAX+1] __read_mostly = {
  * static struct nla_policy my_policy[ATTR_MAX+1] __read_mostly = {
  * 	[ATTR_FOO] = { .type = NLA_U16 },
  * 	[ATTR_FOO] = { .type = NLA_U16 },
- *	[ATTR_BAR] = { .type = NLA_STRING, len = BARSIZ },
+ *	[ATTR_BAR] = { .type = NLA_STRING, .len = BARSIZ },
  *	[ATTR_BAZ] = { .len = sizeof(struct mystruct) },
  *	[ATTR_BAZ] = { .len = sizeof(struct mystruct) },
  * };
  * };
  */
  */

+ 5 - 0
net/netlink/attr.c

@@ -67,6 +67,11 @@ static int validate_nla(struct nlattr *nla, int maxtype,
 		}
 		}
 		break;
 		break;
 
 
+	case NLA_BINARY:
+		if (pt->len && attrlen > pt->len)
+			return -ERANGE;
+		break;
+
 	default:
 	default:
 		if (pt->len)
 		if (pt->len)
 			minlen = pt->len;
 			minlen = pt->len;