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

Commit 4b048d6d authored by Tom Herbert's avatar Tom Herbert Committed by David S. Miller
Browse files

net: Change pseudohdr argument of inet_proto_csum_replace* to be a bool 



inet_proto_csum_replace4,2,16 take a pseudohdr argument which indicates
the checksum field carries a pseudo header. This argument should be a
boolean instead of an int.

Signed-off-by: default avatarTom Herbert <tom@herbertland.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 25368623

include/net/checksum.h

+3 −3
Original line number Diff line number Diff line
@@ -140,14 +140,14 @@ static inline void csum_replace2(__sum16 *sum, __be16 old, __be16 new) 


struct sk_buff;

void inet_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb,

			      __be32 from, __be32 to, int pseudohdr);

			      __be32 from, __be32 to, bool pseudohdr);

void inet_proto_csum_replace16(__sum16 *sum, struct sk_buff *skb,

			       const __be32 *from, const __be32 *to,

			       int pseudohdr);

			       bool pseudohdr);



static inline void inet_proto_csum_replace2(__sum16 *sum, struct sk_buff *skb,

					    __be16 from, __be16 to,

					    int pseudohdr)

					    bool pseudohdr)

{

	inet_proto_csum_replace4(sum, skb, (__force __be32)from,

				 (__force __be32)to, pseudohdr);

net/core/filter.c

+1 −1
Original line number Diff line number Diff line
@@ -1349,7 +1349,7 @@ const struct bpf_func_proto bpf_l3_csum_replace_proto = { 
static u64 bpf_l4_csum_replace(u64 r1, u64 r2, u64 from, u64 to, u64 flags)

{

	struct sk_buff *skb = (struct sk_buff *) (long) r1;

	u32 is_pseudo = BPF_IS_PSEUDO_HEADER(flags);

	bool is_pseudo = !!BPF_IS_PSEUDO_HEADER(flags);

	int offset = (int) r2;

	__sum16 sum, *ptr;

net/core/utils.c

+2 −2
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ int in6_pton(const char *src, int srclen, 
EXPORT_SYMBOL(in6_pton);



void inet_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb,

			      __be32 from, __be32 to, int pseudohdr)

			      __be32 from, __be32 to, bool pseudohdr)

{

	if (skb->ip_summed != CHECKSUM_PARTIAL) {

		csum_replace4(sum, from, to);
@@ -318,7 +318,7 @@ EXPORT_SYMBOL(inet_proto_csum_replace4); 


void inet_proto_csum_replace16(__sum16 *sum, struct sk_buff *skb,

			       const __be32 *from, const __be32 *to,

			       int pseudohdr)

			       bool pseudohdr)

{

	__be32 diff[] = {

		~from[0], ~from[1], ~from[2], ~from[3],

net/ipv4/netfilter/ipt_ECN.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ set_ect_tcp(struct sk_buff *skb, const struct ipt_ECN_info *einfo) 
		tcph->cwr = einfo->proto.tcp.cwr;



	inet_proto_csum_replace2(&tcph->check, skb,

				 oldval, ((__be16 *)tcph)[6], 0);

				 oldval, ((__be16 *)tcph)[6], false);

	return true;

}

net/ipv4/netfilter/nf_nat_l3proto_ipv4.c

+2 −2
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static void nf_nat_ipv4_csum_update(struct sk_buff *skb, 
		oldip = iph->daddr;

		newip = t->dst.u3.ip;

	}

	inet_proto_csum_replace4(check, skb, oldip, newip, 1);

	inet_proto_csum_replace4(check, skb, oldip, newip, true);

}



static void nf_nat_ipv4_csum_recalc(struct sk_buff *skb,
@@ -151,7 +151,7 @@ static void nf_nat_ipv4_csum_recalc(struct sk_buff *skb, 
		}

	} else

		inet_proto_csum_replace2(check, skb,

					 htons(oldlen), htons(datalen), 1);

					 htons(oldlen), htons(datalen), true);

}



#if IS_ENABLED(CONFIG_NF_CT_NETLINK)