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

Commit 8489c1d9 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: raw: revert unrelated change 



Commit 5640f768 ("net: use a per task frag allocator")
accidentally contained an unrelated change to net/ipv4/raw.c,
later committed (without the pr_err() debugging bits) in
net tree as commit ab43ed8b (ipv4: raw: fix icmp_filter())

This patch reverts this glitch, noticed by Stephen Rothwell.

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 82c93fcc

net/ipv4/raw.c

+7 −12
Original line number Diff line number Diff line
@@ -131,23 +131,18 @@ static struct sock *__raw_v4_lookup(struct net *net, struct sock *sk, 
 *	0 - deliver

 *	1 - block

 */

static int icmp_filter(const struct sock *sk, const struct sk_buff *skb)

static __inline__ int icmp_filter(struct sock *sk, struct sk_buff *skb)

{

	struct icmphdr _hdr;

	const struct icmphdr *hdr;



	pr_err("icmp_filter skb_transport_offset %d data-head %ld len %d/%d\n",

		skb_transport_offset(skb), skb->data - skb->head, skb->len, skb->data_len);

	hdr = skb_header_pointer(skb, skb_transport_offset(skb),

				 sizeof(_hdr), &_hdr);

	pr_err("head %p data %p hdr %p type %d\n", skb->head, skb->data, hdr, hdr ? hdr->type : -1);

	if (!hdr)

	int type;



	if (!pskb_may_pull(skb, sizeof(struct icmphdr)))

		return 1;



	if (hdr->type < 32) {

	type = icmp_hdr(skb)->type;

	if (type < 32) {

		__u32 data = raw_sk(sk)->filter.data;



		return ((1U << hdr->type) & data) != 0;

		return ((1 << type) & data) != 0;

	}



	/* Do not block unknown ICMP types */