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

Commit b2e0b385 authored by Jan Engelhardt's avatar Jan Engelhardt
Browse files

netfilter: ipv6: use NFPROTO values for NF_HOOK invocation 



The semantic patch that was used:
// <smpl>
@@
@@
(NF_HOOK
|NF_HOOK_THRESH
|nf_hook
)(
-PF_INET6,
+NFPROTO_IPV6,
 ...)
// </smpl>

Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
parent 9bbc768a

net/ipv6/ip6_input.c

+2 −2
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt 
	/* Must drop socket now because of tproxy. */

	skb_orphan(skb);



	return NF_HOOK(PF_INET6, NF_INET_PRE_ROUTING, skb, dev, NULL,

	return NF_HOOK(NFPROTO_IPV6, NF_INET_PRE_ROUTING, skb, dev, NULL,

		       ip6_rcv_finish);

err:

	IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INHDRERRORS);
@@ -235,7 +235,7 @@ static int ip6_input_finish(struct sk_buff *skb) 


int ip6_input(struct sk_buff *skb)

{

	return NF_HOOK(PF_INET6, NF_INET_LOCAL_IN, skb, skb->dev, NULL,

	return NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_IN, skb, skb->dev, NULL,

		       ip6_input_finish);

}

net/ipv6/ip6_output.c

+8 −8
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ int __ip6_local_out(struct sk_buff *skb) 
		len = 0;

	ipv6_hdr(skb)->payload_len = htons(len);



	return nf_hook(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, skb_dst(skb)->dev,

		       dst_output);

	return nf_hook(NFPROTO_IPV6, NF_INET_LOCAL_OUT, skb, NULL,

		       skb_dst(skb)->dev, dst_output);

}



int ip6_local_out(struct sk_buff *skb)
@@ -134,8 +134,8 @@ static int ip6_output2(struct sk_buff *skb) 
			   is not supported in any case.

			 */

			if (newskb)

				NF_HOOK(PF_INET6, NF_INET_POST_ROUTING, newskb,

					NULL, newskb->dev,

				NF_HOOK(NFPROTO_IPV6, NF_INET_POST_ROUTING,

					newskb, NULL, newskb->dev,

					ip6_dev_loopback_xmit);



			if (ipv6_hdr(skb)->hop_limit == 0) {
@@ -150,7 +150,7 @@ static int ip6_output2(struct sk_buff *skb) 
				skb->len);

	}



	return NF_HOOK(PF_INET6, NF_INET_POST_ROUTING, skb, NULL, skb->dev,

	return NF_HOOK(NFPROTO_IPV6, NF_INET_POST_ROUTING, skb, NULL, skb->dev,

		       ip6_output_finish);

}
@@ -260,8 +260,8 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl, 
	if ((skb->len <= mtu) || skb->local_df || skb_is_gso(skb)) {

		IP6_UPD_PO_STATS(net, ip6_dst_idev(skb_dst(skb)),

			      IPSTATS_MIB_OUT, skb->len);

		return NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, dst->dev,

				dst_output);

		return NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, skb, NULL,

			       dst->dev, dst_output);

	}



	if (net_ratelimit())
@@ -537,7 +537,7 @@ int ip6_forward(struct sk_buff *skb) 
	hdr->hop_limit--;



	IP6_INC_STATS_BH(net, ip6_dst_idev(dst), IPSTATS_MIB_OUTFORWDATAGRAMS);

	return NF_HOOK(PF_INET6, NF_INET_FORWARD, skb, skb->dev, dst->dev,

	return NF_HOOK(NFPROTO_IPV6, NF_INET_FORWARD, skb, skb->dev, dst->dev,

		       ip6_forward_finish);



error:

net/ipv6/ip6mr.c

+1 −1
Original line number Diff line number Diff line
@@ -1566,7 +1566,7 @@ static int ip6mr_forward2(struct sk_buff *skb, struct mfc6_cache *c, int vifi) 


	IP6CB(skb)->flags |= IP6SKB_FORWARDED;



	return NF_HOOK(PF_INET6, NF_INET_FORWARD, skb, skb->dev, dev,

	return NF_HOOK(NFPROTO_IPV6, NF_INET_FORWARD, skb, skb->dev, dev,

		       ip6mr_forward2_finish);



out_free:

net/ipv6/mcast.c

+2 −2
Original line number Diff line number Diff line
@@ -1479,7 +1479,7 @@ static void mld_sendpack(struct sk_buff *skb) 


	payload_len = skb->len;



	err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, skb->dev,

	err = NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, skb, NULL, skb->dev,

		      dst_output);

out:

	if (!err) {
@@ -1847,7 +1847,7 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type) 
		goto err_out;



	skb_dst_set(skb, dst);

	err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, skb->dev,

	err = NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, skb, NULL, skb->dev,

		      dst_output);

out:

	if (!err) {

net/ipv6/ndisc.c

+2 −2
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ void ndisc_send_skb(struct sk_buff *skb, 
	idev = in6_dev_get(dst->dev);

	IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUT, skb->len);



	err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, dst->dev,

	err = NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, skb, NULL, dst->dev,

		      dst_output);

	if (!err) {

		ICMP6MSGOUT_INC_STATS(net, idev, type);
@@ -1617,7 +1617,7 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh, 
	skb_dst_set(buff, dst);

	idev = in6_dev_get(dst->dev);

	IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUT, skb->len);

	err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, buff, NULL, dst->dev,

	err = NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, buff, NULL, dst->dev,

		      dst_output);

	if (!err) {

		ICMP6MSGOUT_INC_STATS(net, idev, NDISC_REDIRECT);