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

!961 [sync] PR-925: tcp: prohibit TCP_REPAIR_OPTIONS if data was already sent 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/925 
 
PR sync from: Lu Wei luwei32@huawei.com https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/thread/I2EQIIQZEV4HWCI4CUWWZFLX2LZQGUDT/ 
 
Link:https://gitee.com/openeuler/kernel/pulls/961

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 1604b194 4b715882

net/ipv4/tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -3295,7 +3295,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level, int optname, 
	case TCP_REPAIR_OPTIONS:

		if (!tp->repair)

			err = -EINVAL;

		else if (sk->sk_state == TCP_ESTABLISHED)

		else if (sk->sk_state == TCP_ESTABLISHED && !tp->bytes_sent)

			err = tcp_repair_options_est(sk, optval, optlen);

		else

			err = -EPERM;