Commit a3377386 authored by Anjali Kulkarni's avatar Anjali Kulkarni Committed by David S. Miller
Browse files

netlink: Reverse the patch which removed filtering 



To use filtering at the connector & cn_proc layers, we need to enable
filtering in the netlink layer. This reverses the patch which removed
netlink filtering - commit ID for that patch:
549017aa (netlink: remove netlink_broadcast_filtered).

Signed-off-by: default avatarAnjali Kulkarni <anjali.k.kulkarni@oracle.com>
Reviewed-by: default avatarLiam R. Howlett <Liam.Howlett@oracle.com>
Acked-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6bfef2ec

include/linux/netlink.h

+5 −0
Original line number Diff line number Diff line
@@ -227,6 +227,11 @@ bool netlink_strict_get_check(struct sk_buff *skb); 
int netlink_unicast(struct sock *ssk, struct sk_buff *skb, __u32 portid, int nonblock);

int netlink_broadcast(struct sock *ssk, struct sk_buff *skb, __u32 portid,

		      __u32 group, gfp_t allocation);

int netlink_broadcast_filtered(struct sock *ssk, struct sk_buff *skb,

			       __u32 portid, __u32 group, gfp_t allocation,

			       int (*filter)(struct sock *dsk,

					     struct sk_buff *skb, void *data),

			       void *filter_data);

int netlink_set_err(struct sock *ssk, __u32 portid, __u32 group, int code);

int netlink_register_notifier(struct notifier_block *nb);

int netlink_unregister_notifier(struct notifier_block *nb);

net/netlink/af_netlink.c

+25 −2
Original line number Diff line number Diff line
@@ -1432,6 +1432,8 @@ struct netlink_broadcast_data { 
	int delivered;

	gfp_t allocation;

	struct sk_buff *skb, *skb2;

	int (*tx_filter)(struct sock *dsk, struct sk_buff *skb, void *data);

	void *tx_data;

};



static void do_one_broadcast(struct sock *sk,
@@ -1485,6 +1487,13 @@ static void do_one_broadcast(struct sock *sk, 
			p->delivery_failure = 1;

		goto out;

	}



	if (p->tx_filter && p->tx_filter(sk, p->skb2, p->tx_data)) {

		kfree_skb(p->skb2);

		p->skb2 = NULL;

		goto out;

	}



	if (sk_filter(sk, p->skb2)) {

		kfree_skb(p->skb2);

		p->skb2 = NULL;
@@ -1507,8 +1516,12 @@ static void do_one_broadcast(struct sock *sk, 
	sock_put(sk);

}



int netlink_broadcast(struct sock *ssk, struct sk_buff *skb, u32 portid,

		      u32 group, gfp_t allocation)

int netlink_broadcast_filtered(struct sock *ssk, struct sk_buff *skb,

			       u32 portid,

			       u32 group, gfp_t allocation,

			       int (*filter)(struct sock *dsk,

					     struct sk_buff *skb, void *data),

			       void *filter_data)

{

	struct net *net = sock_net(ssk);

	struct netlink_broadcast_data info;
@@ -1527,6 +1540,8 @@ int netlink_broadcast(struct sock *ssk, struct sk_buff *skb, u32 portid, 
	info.allocation = allocation;

	info.skb = skb;

	info.skb2 = NULL;

	info.tx_filter = filter;

	info.tx_data = filter_data;



	/* While we sleep in clone, do not allow to change socket list */
@@ -1552,6 +1567,14 @@ int netlink_broadcast(struct sock *ssk, struct sk_buff *skb, u32 portid, 
	}

	return -ESRCH;

}

EXPORT_SYMBOL(netlink_broadcast_filtered);



int netlink_broadcast(struct sock *ssk, struct sk_buff *skb, u32 portid,

		      u32 group, gfp_t allocation)

{

	return netlink_broadcast_filtered(ssk, skb, portid, group, allocation,

					  NULL, NULL);

}

EXPORT_SYMBOL(netlink_broadcast);



struct netlink_set_err_data {