Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d31f4d44 authored by Tomasz Bursztyka's avatar Tomasz Bursztyka Committed by Pablo Neira Ayuso
Browse files

netfilter: ipset: fix crash if IPSET_CMD_NONE command is sent 



This patch fixes a crash if that ipset command is sent over nfnetlink.

Signed-off-by: default avatarTomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
Acked-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent a2da3998

net/netfilter/ipset/ip_set_core.c

+12 −0
Original line number Diff line number Diff line
@@ -639,6 +639,14 @@ find_free_id(const char *name, ip_set_id_t *index, struct ip_set **set) 
	return 0;

}



static int

ip_set_none(struct sock *ctnl, struct sk_buff *skb,

	    const struct nlmsghdr *nlh,

	    const struct nlattr * const attr[])

{

	return -EOPNOTSUPP;

}



static int

ip_set_create(struct sock *ctnl, struct sk_buff *skb,

	      const struct nlmsghdr *nlh,
@@ -1539,6 +1547,10 @@ ip_set_protocol(struct sock *ctnl, struct sk_buff *skb, 
}



static const struct nfnl_callback ip_set_netlink_subsys_cb[IPSET_MSG_MAX] = {

	[IPSET_CMD_NONE]	= {

		.call		= ip_set_none,

		.attr_count	= IPSET_ATTR_CMD_MAX,

	},

	[IPSET_CMD_CREATE]	= {

		.call		= ip_set_create,

		.attr_count	= IPSET_ATTR_CMD_MAX,