Skip to content

Commit 0c1282c

Browse files
edumazetgregkh
authored andcommitted
tcp: do not mangle skb->cb[] in tcp_make_synack()
[ Upstream commit 3b11775033dc87c3d161996c54507b15ba26414a ] Christoph Paasch sent a patch to address the following issue : tcp_make_synack() is leaving some TCP private info in skb->cb[], then send the packet by other means than tcp_transmit_skb() tcp_transmit_skb() makes sure to clear skb->cb[] to not confuse IPv4/IPV6 stacks, but we have no such cleanup for SYNACK. tcp_make_synack() should not use tcp_init_nondata_skb() : tcp_init_nondata_skb() really should be limited to skbs put in write/rtx queues (the ones that are only sent via tcp_transmit_skb()) This patch fixes the issue and should even save few cpu cycles ;) Fixes: 971f10e ("tcp: better TCP_SKB_CB layout to reduce cache line misses") Signed-off-by: Eric Dumazet <edumazet@google.com> Reported-by: Christoph Paasch <cpaasch@apple.com> Reviewed-by: Christoph Paasch <cpaasch@apple.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 26d6298 commit 0c1282c

1 file changed

Lines changed: 2 additions & 7 deletions

File tree

net/ipv4/tcp_output.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3018,13 +3018,8 @@ struct sk_buff *tcp_make_synack(const struct sock *sk, struct dst_entry *dst,
30183018
tcp_ecn_make_synack(req, th);
30193019
th->source = htons(ireq->ir_num);
30203020
th->dest = ireq->ir_rmt_port;
3021-
/* Setting of flags are superfluous here for callers (and ECE is
3022-
* not even correctly set)
3023-
*/
3024-
tcp_init_nondata_skb(skb, tcp_rsk(req)->snt_isn,
3025-
TCPHDR_SYN | TCPHDR_ACK);
3026-
3027-
th->seq = htonl(TCP_SKB_CB(skb)->seq);
3021+
skb->ip_summed = CHECKSUM_PARTIAL;
3022+
th->seq = htonl(tcp_rsk(req)->snt_isn);
30283023
/* XXX data is queued and acked as is. No buffer/window check */
30293024
th->ack_seq = htonl(tcp_rsk(req)->rcv_nxt);
30303025

0 commit comments

Comments
 (0)