Commit b6f875a8 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf 



Pablo Neira Ayuso says:

====================
Netfilter fixes for net

The following patchset contains Netfilter fixes for net:

1) Do not update the UDP checksum when it's zero, from Guillaume Nault.

2) Fix return of local variable in nf_osf, from Arnd Bergmann.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c778980a c165d57b

net/netfilter/nf_nat_proto.c

+1 −3
Original line number Diff line number Diff line
@@ -68,15 +68,13 @@ static bool udp_manip_pkt(struct sk_buff *skb, 
			  enum nf_nat_manip_type maniptype)

{

	struct udphdr *hdr;

	bool do_csum;



	if (skb_ensure_writable(skb, hdroff + sizeof(*hdr)))

		return false;



	hdr = (struct udphdr *)(skb->data + hdroff);

	do_csum = hdr->check || skb->ip_summed == CHECKSUM_PARTIAL;

	__udp_manip_pkt(skb, iphdroff, hdr, tuple, maniptype, !!hdr->check);



	__udp_manip_pkt(skb, iphdroff, hdr, tuple, maniptype, do_csum);

	return true;

}

net/netfilter/nfnetlink_osf.c

+7 −5
Original line number Diff line number Diff line
@@ -165,12 +165,12 @@ static bool nf_osf_match_one(const struct sk_buff *skb, 
static const struct tcphdr *nf_osf_hdr_ctx_init(struct nf_osf_hdr_ctx *ctx,

						const struct sk_buff *skb,

						const struct iphdr *ip,

						unsigned char *opts)

						unsigned char *opts,

						struct tcphdr *_tcph)

{

	const struct tcphdr *tcp;

	struct tcphdr _tcph;



	tcp = skb_header_pointer(skb, ip_hdrlen(skb), sizeof(struct tcphdr), &_tcph);

	tcp = skb_header_pointer(skb, ip_hdrlen(skb), sizeof(struct tcphdr), _tcph);

	if (!tcp)

		return NULL;
@@ -205,10 +205,11 @@ nf_osf_match(const struct sk_buff *skb, u_int8_t family, 
	int fmatch = FMATCH_WRONG;

	struct nf_osf_hdr_ctx ctx;

	const struct tcphdr *tcp;

	struct tcphdr _tcph;



	memset(&ctx, 0, sizeof(ctx));



	tcp = nf_osf_hdr_ctx_init(&ctx, skb, ip, opts);

	tcp = nf_osf_hdr_ctx_init(&ctx, skb, ip, opts, &_tcph);

	if (!tcp)

		return false;
@@ -265,10 +266,11 @@ bool nf_osf_find(const struct sk_buff *skb, 
	const struct nf_osf_finger *kf;

	struct nf_osf_hdr_ctx ctx;

	const struct tcphdr *tcp;

	struct tcphdr _tcph;



	memset(&ctx, 0, sizeof(ctx));



	tcp = nf_osf_hdr_ctx_init(&ctx, skb, ip, opts);

	tcp = nf_osf_hdr_ctx_init(&ctx, skb, ip, opts, &_tcph);

	if (!tcp)

		return false;

CRA Git | Maintained and supported by SUSTech CRA and CCSE