From 6bdb512b21d63e3349e04dd6276b48224c7f029e Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Thu, 3 Nov 2011 00:10:05 +0000 Subject: [PATCH] --- yaml --- r: 275080 b: refs/heads/master c: 4b6cc7284ddc9a54910f111085ebf0143ef3f5bd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/netlink.h | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2425ee130925..f2f227a3aa18 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c30bc94758ae2a38a5eb31767c1985c0aae0950b +refs/heads/master: 4b6cc7284ddc9a54910f111085ebf0143ef3f5bd diff --git a/trunk/include/net/netlink.h b/trunk/include/net/netlink.h index 98c185441bee..cb1f3504687f 100644 --- a/trunk/include/net/netlink.h +++ b/trunk/include/net/netlink.h @@ -192,8 +192,15 @@ enum { * NLA_NUL_STRING Maximum length of string (excluding NUL) * NLA_FLAG Unused * NLA_BINARY Maximum length of attribute payload - * NLA_NESTED_COMPAT Exact length of structure payload - * All other Exact length of attribute payload + * NLA_NESTED Don't use `len' field -- length verification is + * done by checking len of nested header (or empty) + * NLA_NESTED_COMPAT Minimum length of structure payload + * NLA_U8, NLA_U16, + * NLA_U32, NLA_U64, + * NLA_MSECS Leaving the length field zero will verify the + * given type fits, using it verifies minimum length + * just like "All other" + * All other Minimum length of attribute payload * * Example: * static const struct nla_policy my_policy[ATTR_MAX+1] = {