summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorTom Herbert <therbert@google.com>2013-01-26 07:50:54 +0000
committerDavid S. Miller <davem@davemloft.net>2013-01-27 01:01:42 -0500
commit9c5e0c0bbc5f683ada546af3c39a5a90b156a6f0 (patch)
treed68bb14e49ebd8ed892e45eb34da0b1e9c12152b /net/ipv4
parent5588d3742da9900323dc3d766845a53bacdfb5ab (diff)
downloadlinux-9c5e0c0bbc5f683ada546af3c39a5a90b156a6f0.tar.bz2
soreuseport: fix use of uid in tb->fastuid
Fix a reported compilation error where ia variable of type kuid_t was being set to zero. Eliminate two instances of setting tb->fastuid to zero. tb->fastuid is only used if tb->fastreuseport is set, so there should be no problem if tb->fastuid is not initialized (when tb->fastreuesport is zero). Signed-off-by: Tom Herbert <therbert@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/inet_connection_sock.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 8bb623d357ad..11cb4979a465 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -204,7 +204,8 @@ tb_found:
ret = 1;
if (inet_csk(sk)->icsk_af_ops->bind_conflict(sk, tb, true)) {
if (((sk->sk_reuse && sk->sk_state != TCP_LISTEN) ||
- (sk->sk_reuseport && uid_eq(tb->fastuid, uid))) &&
+ (tb->fastreuseport > 0 &&
+ sk->sk_reuseport && uid_eq(tb->fastuid, uid))) &&
smallest_size != -1 && --attempts >= 0) {
spin_unlock(&head->lock);
goto again;
@@ -227,19 +228,15 @@ tb_not_found:
if (sk->sk_reuseport) {
tb->fastreuseport = 1;
tb->fastuid = uid;
- } else {
+ } else
tb->fastreuseport = 0;
- tb->fastuid = 0;
- }
} else {
if (tb->fastreuse &&
(!sk->sk_reuse || sk->sk_state == TCP_LISTEN))
tb->fastreuse = 0;
if (tb->fastreuseport &&
- (!sk->sk_reuseport || !uid_eq(tb->fastuid, uid))) {
+ (!sk->sk_reuseport || !uid_eq(tb->fastuid, uid)))
tb->fastreuseport = 0;
- tb->fastuid = 0;
- }
}
success:
if (!inet_csk(sk)->icsk_bind_hash)