Unverified Commit 35f92706 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12522 netfilter: nf_reject_ipv6: fix nf_reject_ip6_tcphdr_put() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/2MKAN426AXNNLK5BIDRDDTCQCWQWSDFD/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYPK8 
 
Link:https://gitee.com/openeuler/kernel/pulls/12522

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 2e53e758 cb3ae8e4

net/ipv6/netfilter/nf_reject_ipv6.c

+2 −12
Original line number Diff line number Diff line
@@ -89,33 +89,23 @@ void nf_reject_ip6_tcphdr_put(struct sk_buff *nskb, 
			      const struct tcphdr *oth, unsigned int otcplen)

{

	struct tcphdr *tcph;

	int needs_ack;



	skb_reset_transport_header(nskb);

	tcph = skb_put(nskb, sizeof(struct tcphdr));

	tcph = skb_put_zero(nskb, sizeof(struct tcphdr));

	/* Truncate to length (no data) */

	tcph->doff = sizeof(struct tcphdr)/4;

	tcph->source = oth->dest;

	tcph->dest = oth->source;



	if (oth->ack) {

		needs_ack = 0;

		tcph->seq = oth->ack_seq;

		tcph->ack_seq = 0;

	} else {

		needs_ack = 1;

		tcph->ack_seq = htonl(ntohl(oth->seq) + oth->syn + oth->fin +

				      otcplen - (oth->doff<<2));

		tcph->seq = 0;

		tcph->ack = 1;

	}



	/* Reset flags */

	((u_int8_t *)tcph)[13] = 0;

	tcph->rst = 1;

	tcph->ack = needs_ack;

	tcph->window = 0;

	tcph->urg_ptr = 0;

	tcph->check = 0;



	/* Adjust TCP checksum */

	tcph->check = csum_ipv6_magic(&ipv6_hdr(nskb)->saddr,