X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=net%2Fipv4%2Ftcp.c;h=bd6400e1ae9f8ae595bbe759ff3dfb1bd02765e2;hb=348b81b68b13ebd489a3e6a46aa1c384c731c919;hp=e03e08745308189c9d64509c2cff94da56c86a0c;hpb=74099e20348e84e62b5ea6ef270f91db48bc1352;p=tomoyo%2Ftomoyo-test1.git

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index e03e08745308..bd6400e1ae9f 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -3674,7 +3674,7 @@ int do_tcp_setsockopt(struct sock *sk, int level, int optname,
 	case TCP_TX_DELAY:
 		if (val)
 			tcp_enable_tx_delay();
-		tp->tcp_tx_delay = val;
+		WRITE_ONCE(tp->tcp_tx_delay, val);
 		break;
 	default:
 		err = -ENOPROTOOPT;
@@ -4154,7 +4154,7 @@ int do_tcp_getsockopt(struct sock *sk, int level,
 		break;
 
 	case TCP_TX_DELAY:
-		val = tp->tcp_tx_delay;
+		val = READ_ONCE(tp->tcp_tx_delay);
 		break;
 
 	case TCP_TIMESTAMP: