net: fix __sock_gen_cookie()
authorEric Dumazet <edumazet@google.com>
Fri, 18 Nov 2022 04:38:43 +0000 (04:38 +0000)
committerJakub Kicinski <kuba@kernel.org>
Tue, 22 Nov 2022 04:36:30 +0000 (20:36 -0800)
commit32634819ad37290b5d5a84bf8b71ef5e972c4a20
tree93240c111c96da7c1cb1366afdf324d43c778eaa
parent2c45455ea1a32a45200562ad99f238aae34ce496
net: fix __sock_gen_cookie()

I was mistaken how atomic64_try_cmpxchg(&sk_cookie, &res, new)
is working.

I was assuming @res would contain the final sk_cookie value,
regardless of the success of our cmpxchg()

We could do something like:

if (atomic64_try_cmpxchg(&sk_cookie, &res, new)
res = new;

But we can avoid a conditional and read sk_cookie again.

atomic64_cmpxchg(&sk_cookie, res, new);
res = atomic64_read(&sk_cookie);

Reported-by: coverity-bot <keescook+coverity-bot@chromium.org>
Addresses-Coverity-ID: 1527347 ("Error handling issues")
Fixes: 4ebf802cf1c6 ("net: __sock_gen_cookie() cleanup")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20221118043843.3703186-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/core/sock_diag.c