diff options
| -rw-r--r-- | include/linux/thermal.h | 2 | ||||
| -rw-r--r-- | net/netlink/genetlink.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/thermal.h b/include/linux/thermal.h index 796f1ff0388..16620470455 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -108,7 +108,7 @@ struct thermal_zone_device { /* Adding event notification support elements */ #define THERMAL_GENL_FAMILY_NAME "thermal_event" #define THERMAL_GENL_VERSION 0x01 -#define THERMAL_GENL_MCAST_GROUP_NAME "thermal_mc_group" +#define THERMAL_GENL_MCAST_GROUP_NAME "thermal_mc_grp" enum events { THERMAL_AUX0, 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(); |