From 95dcc82b80b73d36f99ddd8ebdd6ec11bad23444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
Date: Wed, 22 Mar 2023 16:13:37 -0700
Subject: [PATCH] ANDROID: fix ABI by undoing atomic64_t -> u64 type conversion
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is pretty much a no-op, but avoids changing struct net ABI.

Bug: 274789652
Test: builds, net_test
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Original-Change-Id: Ia744bdf0a026adccaef8382aaecc771a8d0763a6
Change-Id: Ic22d6bb5e35a7634c1dd4d4c3ed3b142b885ec6f
---
 net/core/sock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/core/sock.c b/net/core/sock.c
index 7ffdb2bc1c20..296907faf35e 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1546,7 +1546,7 @@ static int sk_getsockopt(struct sock *sk, int level, int optname,
 		lv = sizeof(u64);
 		if (len != lv)
 			return -EINVAL;
-		v.val64 = sock_net(sk)->net_cookie;
+		v.val64 = atomic64_read(&sock_net(sk)->net_cookie);
 		break;
 
 	default: