]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
genetlink: fix genl_set_err() group ID
authorJohannes Berg <johannes.berg@intel.com>
Thu, 21 Nov 2013 17:20:28 +0000 (18:20 +0100)
committerDavid S. Miller <davem@davemloft.net>
Thu, 21 Nov 2013 18:09:43 +0000 (13:09 -0500)
Fix another really stupid bug - I introduced genl_set_err()
precisely to be able to adjust the group and reject invalid
ones, but then forgot to do so.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/genetlink.h

index 771af09e90eb864ef49642f636a214001a31dd6a..1b177ed803b7aa99045fec46e6449b29b76ac323 100644 (file)
@@ -384,6 +384,9 @@ static inline struct sk_buff *genlmsg_new(size_t payload, gfp_t flags)
 static inline int genl_set_err(struct genl_family *family, struct net *net,
                               u32 portid, u32 group, int code)
 {
+       if (WARN_ON_ONCE(group >= family->n_mcgrps))
+               return -EINVAL;
+       group = family->mcgrp_offset + group;
        return netlink_set_err(net->genl_sock, portid, group, code);
 }