summaryrefslogtreecommitdiff
path: root/net/netlink/attr.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-04-30 06:38:01 +0400
committerPaul Mackerras <paulus@samba.org>2007-04-30 06:38:01 +0400
commit49e1900d4cc2e7bcecb681fe60f0990bec2dcce8 (patch)
tree253801ebf57e0a23856a2c7be129c2c178f62fdf /net/netlink/attr.c
parent34f6d749c0a328817d5e36274e53121c1db734dc (diff)
parentb9099ff63c75216d6ca10bce5a1abcd9293c27e6 (diff)
downloadlinux-49e1900d4cc2e7bcecb681fe60f0990bec2dcce8.tar.xz
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'net/netlink/attr.c')
-rw-r--r--net/netlink/attr.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/netlink/attr.c b/net/netlink/attr.c
index 004139557e09..df5f820a4c32 100644
--- a/net/netlink/attr.c
+++ b/net/netlink/attr.c
@@ -67,6 +67,11 @@ static int validate_nla(struct nlattr *nla, int maxtype,
}
break;
+ case NLA_BINARY:
+ if (pt->len && attrlen > pt->len)
+ return -ERANGE;
+ break;
+
default:
if (pt->len)
minlen = pt->len;