Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next (8f9c208f) · Commits · e / devices / android_kernel_oneplus_sm7250

include/linux/dccp.h

+6 −2

Original line number	Diff line number	Diff line
		@@ -376,8 +376,10 @@ static inline unsigned int dccp_hdr_len(const struct sk_buff *skb)
		/**
		* struct dccp_request_sock - represent DCCP-specific connection request
		* @dreq_inet_rsk: structure inherited from
		* @dreq_iss: initial sequence number sent on the Response (RFC 4340, 7.1)
		* @dreq_isr: initial sequence number received on the Request
		* @dreq_iss: initial sequence number, sent on the first Response (RFC 4340, 7.1)
		* @dreq_gss: greatest sequence number sent (for retransmitted Responses)
		* @dreq_isr: initial sequence number received in the first Request
		* @dreq_gsr: greatest sequence number received (for retransmitted Request(s))
		* @dreq_service: service code present on the Request (there is just one)
		* @dreq_featneg: feature negotiation options for this connection
		* The following two fields are analogous to the ones in dccp_sock:
		@@ -387,7 +389,9 @@ static inline unsigned int dccp_hdr_len(const struct sk_buff *skb)
		struct dccp_request_sock {
		struct inet_request_sock dreq_inet_rsk;
		__u64 dreq_iss;
		__u64 dreq_gss;
		__u64 dreq_isr;
		__u64 dreq_gsr;
		__be32 dreq_service;
		struct list_head dreq_featneg;
		__u32 dreq_timestamp_echo;

net/dccp/ccids/ccid3.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -98,6 +98,7 @@ static void ccid3_update_send_interval(struct ccid3_hc_tx_sock *hc)
		{
		hc->tx_t_ipi = scaled_div32(((u64)hc->tx_s) << 6, hc->tx_x);

		DCCP_BUG_ON(hc->tx_t_ipi == 0);
		ccid3_pr_debug("t_ipi=%u, s=%u, X=%u\n", hc->tx_t_ipi,
		hc->tx_s, (unsigned)(hc->tx_x >> 6));
		}
		@@ -236,8 +237,6 @@ static void ccid3_hc_tx_no_feedback_timer(unsigned long data)
		*
		* Note that X_recv is scaled by 2^6 while X_calc is not
		*/
		BUG_ON(hc->tx_p && !hc->tx_x_calc);

		if (hc->tx_x_calc > (hc->tx_x_recv >> 5))
		hc->tx_x_recv =
		max(hc->tx_x_recv / 2,

net/dccp/ipv4.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -300,7 +300,8 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info)
		*/
		WARN_ON(req->sk);

		if (seq != dccp_rsk(req)->dreq_iss) {
		if (!between48(seq, dccp_rsk(req)->dreq_iss,
		dccp_rsk(req)->dreq_gss)) {
		NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS);
		goto out;
		}
		@@ -639,11 +640,12 @@ int dccp_v4_conn_request(struct sock sk, struct sk_buff skb)
		*
		* Set S.ISR, S.GSR, S.SWL, S.SWH from packet or Init Cookie
		*
		* In fact we defer setting S.GSR, S.SWL, S.SWH to
		* dccp_create_openreq_child.
		* Setting S.SWL/S.SWH to is deferred to dccp_create_openreq_child().
		*/
		dreq->dreq_isr = dcb->dccpd_seq;
		dreq->dreq_gsr = dreq->dreq_isr;
		dreq->dreq_iss = dccp_v4_init_sequence(skb);
		dreq->dreq_gss = dreq->dreq_iss;
		dreq->dreq_service = service;

		if (dccp_v4_send_response(sk, req, NULL))

net/dccp/ipv6.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -193,7 +193,8 @@ static void dccp_v6_err(struct sk_buff skb, struct inet6_skb_parm opt,
		*/
		WARN_ON(req->sk != NULL);

		if (seq != dccp_rsk(req)->dreq_iss) {
		if (!between48(seq, dccp_rsk(req)->dreq_iss,
		dccp_rsk(req)->dreq_gss)) {
		NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS);
		goto out;
		}
		@@ -440,11 +441,12 @@ static int dccp_v6_conn_request(struct sock sk, struct sk_buff skb)
		*
		* Set S.ISR, S.GSR, S.SWL, S.SWH from packet or Init Cookie
		*
		* In fact we defer setting S.GSR, S.SWL, S.SWH to
		* dccp_create_openreq_child.
		* Setting S.SWL/S.SWH to is deferred to dccp_create_openreq_child().
		*/
		dreq->dreq_isr = dcb->dccpd_seq;
		dreq->dreq_gsr = dreq->dreq_isr;
		dreq->dreq_iss = dccp_v6_init_sequence(skb);
		dreq->dreq_gss = dreq->dreq_iss;
		dreq->dreq_service = service;

		if (dccp_v6_send_response(sk, req, NULL))

net/dccp/minisocks.c

+11 −7

Original line number	Diff line number	Diff line
		@@ -127,9 +127,11 @@ struct sock dccp_create_openreq_child(struct sock sk,
		* activation below, as these windows all depend on the local
		* and remote Sequence Window feature values (7.5.2).
		*/
		newdp->dccps_gss = newdp->dccps_iss = dreq->dreq_iss;
		newdp->dccps_iss = dreq->dreq_iss;
		newdp->dccps_gss = dreq->dreq_gss;
		newdp->dccps_gar = newdp->dccps_iss;
		newdp->dccps_gsr = newdp->dccps_isr = dreq->dreq_isr;
		newdp->dccps_isr = dreq->dreq_isr;
		newdp->dccps_gsr = dreq->dreq_gsr;

		/*
		* Activate features: initialise CCIDs, sequence windows etc.
		@@ -164,9 +166,9 @@ struct sock dccp_check_req(struct sock sk, struct sk_buff *skb,
		/* Check for retransmitted REQUEST */
		if (dccp_hdr(skb)->dccph_type == DCCP_PKT_REQUEST) {

		if (after48(DCCP_SKB_CB(skb)->dccpd_seq, dreq->dreq_isr)) {
		if (after48(DCCP_SKB_CB(skb)->dccpd_seq, dreq->dreq_gsr)) {
		dccp_pr_debug("Retransmitted REQUEST\n");
		dreq->dreq_isr = DCCP_SKB_CB(skb)->dccpd_seq;
		dreq->dreq_gsr = DCCP_SKB_CB(skb)->dccpd_seq;
		/*
		* Send another RESPONSE packet
		* To protect against Request floods, increment retrans
		@@ -186,12 +188,14 @@ struct sock dccp_check_req(struct sock sk, struct sk_buff *skb,
		goto drop;

		/* Invalid ACK */
		if (DCCP_SKB_CB(skb)->dccpd_ack_seq != dreq->dreq_iss) {
		if (!between48(DCCP_SKB_CB(skb)->dccpd_ack_seq,
		dreq->dreq_iss, dreq->dreq_gss)) {
		dccp_pr_debug("Invalid ACK number: ack_seq=%llu, "
		"dreq_iss=%llu\n",
		"dreq_iss=%llu, dreq_gss=%llu\n",
		(unsigned long long)
		DCCP_SKB_CB(skb)->dccpd_ack_seq,
		(unsigned long long) dreq->dreq_iss);
		(unsigned long long) dreq->dreq_iss,
		(unsigned long long) dreq->dreq_gss);
		goto drop;
		}