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

Commit fa50d974 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David S. Miller
Browse files

ipv4: Namespaceify ip_default_ttl sysctl knob 



Signed-off-by: default avatarNikolay Borisov <kernel@kyup.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6cd21d79

include/net/netns/ipv4.h

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ struct netns_ipv4 { 
	int sysctl_tcp_ecn;

	int sysctl_tcp_ecn_fallback;



	int sysctl_ip_default_ttl;

	int sysctl_ip_no_pmtu_disc;

	int sysctl_ip_fwd_use_pmtu;

	int sysctl_ip_nonlocal_bind;

include/net/route.h

+2 −3
Original line number Diff line number Diff line
@@ -329,14 +329,13 @@ static inline int inet_iif(const struct sk_buff *skb) 
	return skb->skb_iif;

}



extern int sysctl_ip_default_ttl;



static inline int ip4_dst_hoplimit(const struct dst_entry *dst)

{

	int hoplimit = dst_metric_raw(dst, RTAX_HOPLIMIT);

	struct net *net = dev_net(dst->dev);



	if (hoplimit == 0)

		hoplimit = sysctl_ip_default_ttl;

		hoplimit = net->ipv4.sysctl_ip_default_ttl;

	return hoplimit;

}

net/bridge/netfilter/nft_reject_bridge.c

+5 −3
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ static void nft_reject_br_send_v4_tcp_reset(struct sk_buff *oldskb, 
	struct iphdr *niph;

	const struct tcphdr *oth;

	struct tcphdr _oth;

	struct net *net = sock_net(oldskb->sk);



	if (!nft_bridge_iphdr_validate(oldskb))

		return;
@@ -63,9 +64,9 @@ static void nft_reject_br_send_v4_tcp_reset(struct sk_buff *oldskb, 


	skb_reserve(nskb, LL_MAX_HEADER);

	niph = nf_reject_iphdr_put(nskb, oldskb, IPPROTO_TCP,

				   sysctl_ip_default_ttl);

				   net->ipv4.sysctl_ip_default_ttl);

	nf_reject_ip_tcphdr_put(nskb, oldskb, oth);

	niph->ttl	= sysctl_ip_default_ttl;

	niph->ttl	= net->ipv4.sysctl_ip_default_ttl;

	niph->tot_len	= htons(nskb->len);

	ip_send_check(niph);
@@ -85,6 +86,7 @@ static void nft_reject_br_send_v4_unreach(struct sk_buff *oldskb, 
	void *payload;

	__wsum csum;

	u8 proto;

	struct net *net = sock_net(oldskb->sk);



	if (oldskb->csum_bad || !nft_bridge_iphdr_validate(oldskb))

		return;
@@ -119,7 +121,7 @@ static void nft_reject_br_send_v4_unreach(struct sk_buff *oldskb, 


	skb_reserve(nskb, LL_MAX_HEADER);

	niph = nf_reject_iphdr_put(nskb, oldskb, IPPROTO_ICMP,

				   sysctl_ip_default_ttl);

				   net->ipv4.sysctl_ip_default_ttl);



	skb_reset_transport_header(nskb);

	icmph = (struct icmphdr *)skb_put(nskb, sizeof(struct icmphdr));

net/ipv4/ip_output.c

+0 −3
Original line number Diff line number Diff line
@@ -79,9 +79,6 @@ 
#include <linux/netlink.h>

#include <linux/tcp.h>



int sysctl_ip_default_ttl __read_mostly = IPDEFTTL;

EXPORT_SYMBOL(sysctl_ip_default_ttl);



static int

ip_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,

	    unsigned int mtu,

net/ipv4/ip_sockglue.c

+4 −1
Original line number Diff line number Diff line
@@ -1341,10 +1341,13 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname, 
		val = inet->tos;

		break;

	case IP_TTL:

	{

		struct net *net = sock_net(sk);

		val = (inet->uc_ttl == -1 ?

		       sysctl_ip_default_ttl :

		       net->ipv4.sysctl_ip_default_ttl :

		       inet->uc_ttl);

		break;

	}

	case IP_HDRINCL:

		val = inet->hdrincl;

		break;