summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorMasatake YAMATO <yamato@redhat.com>2013-04-01 14:50:40 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-05 10:04:38 -0700
commitb9f3bf1d0fe1e9ef11d1d607906138e9f84f7616 (patch)
tree34b9e1f7679eb5f563c0e506ff811d736878774c /net
parenta83417946df6c57fbb4d4383c992c5ffd59b56c2 (diff)
downloadlinux-3.10-b9f3bf1d0fe1e9ef11d1d607906138e9f84f7616.tar.gz
linux-3.10-b9f3bf1d0fe1e9ef11d1d607906138e9f84f7616.tar.bz2
linux-3.10-b9f3bf1d0fe1e9ef11d1d607906138e9f84f7616.zip
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-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 9f40441d7a7..73d3f0c84ce 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -142,6 +142,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();