aboutsummaryrefslogtreecommitdiff
path: root/net/netlink
diff options
context:
space:
mode:
authorMasatake YAMATO <yamato@redhat.com>2013-04-01 14:50:40 -0400
committerBen Hutchings <ben@decadent.org.uk>2013-04-10 03:20:11 +0100
commita821be212a53dc96b145cb0f397da48185233425 (patch)
treefc0fb13ebf6b68966f3de3510e29d11666ef5953 /net/netlink
parenta7fe44f2340bd4c77428ad97f903ff31e67d6208 (diff)
thermal: shorten too long mcast group name
[ Upstream commits 73214f5d9f33b79918b1f7babddd5c8af28dd23d and f1e79e208076ffe7bad97158275f1c572c04f5c7, the latter adds an assertion to genetlink to prevent this from happening again in the future. ] The original name is too long. Signed-off-by: Masatake YAMATO <yamato@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/netlink')
-rw-r--r--net/netlink/genetlink.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 482fa571b4e..874f8ffbe42 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -134,6 +134,7 @@ int genl_register_mc_group(struct genl_family *family,
int err = 0;
BUG_ON(grp->name[0] == '\0');
+ BUG_ON(memchr(grp->name, '\0', GENL_NAMSIZ) == NULL);
genl_lock();