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

Commit 372892ec authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Pablo Neira Ayuso
Browse files

ipv4: Push struct net down into nf_send_reset 



This is needed so struct net can be pushed down into
ip_route_me_harder.

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent c3456026

include/net/netfilter/ipv4/nf_reject.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#include <net/icmp.h>



void nf_send_unreach(struct sk_buff *skb_in, int code, int hook);

void nf_send_reset(struct sk_buff *oldskb, int hook);

void nf_send_reset(struct net *net, struct sk_buff *oldskb, int hook);



const struct tcphdr *nf_reject_ip_tcphdr_get(struct sk_buff *oldskb,

					     struct tcphdr *_oth, int hook);

net/ipv4/netfilter/ipt_REJECT.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ reject_tg(struct sk_buff *skb, const struct xt_action_param *par) 
		nf_send_unreach(skb, ICMP_PKT_FILTERED, hook);

		break;

	case IPT_TCP_RESET:

		nf_send_reset(skb, hook);

		nf_send_reset(par->net, skb, hook);

	case IPT_ICMP_ECHOREPLY:

		/* Doesn't happen. */

		break;

net/ipv4/netfilter/nf_reject_ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ void nf_reject_ip_tcphdr_put(struct sk_buff *nskb, const struct sk_buff *oldskb, 
EXPORT_SYMBOL_GPL(nf_reject_ip_tcphdr_put);



/* Send RST reply */

void nf_send_reset(struct sk_buff *oldskb, int hook)

void nf_send_reset(struct net *net, struct sk_buff *oldskb, int hook)

{

	struct sk_buff *nskb;

	const struct iphdr *oiph;

net/ipv4/netfilter/nft_reject_ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static void nft_reject_ipv4_eval(const struct nft_expr *expr, 
		nf_send_unreach(pkt->skb, priv->icmp_code, pkt->hook);

		break;

	case NFT_REJECT_TCP_RST:

		nf_send_reset(pkt->skb, pkt->hook);

		nf_send_reset(pkt->net, pkt->skb, pkt->hook);

		break;

	default:

		break;

net/netfilter/nft_reject_inet.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static void nft_reject_inet_eval(const struct nft_expr *expr, 
					pkt->hook);

			break;

		case NFT_REJECT_TCP_RST:

			nf_send_reset(pkt->skb, pkt->hook);

			nf_send_reset(pkt->net, pkt->skb, pkt->hook);

			break;

		case NFT_REJECT_ICMPX_UNREACH:

			nf_send_unreach(pkt->skb,