Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ba98718 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by David S. Miller
Browse files

inet: Avoid unitialized variable warning in inet_unhash() 



With gcc-4.1.2:

    net/ipv4/inet_hashtables.c: In function ‘inet_unhash’:
    net/ipv4/inet_hashtables.c:628: warning: ‘ilb’ may be used uninitialized in this function

While this is a false positive, it can easily be avoided by using the
pointer itself as the canary variable.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 367dc658

net/ipv4/inet_hashtables.c

+2 −4
Original line number Diff line number Diff line
@@ -625,9 +625,8 @@ EXPORT_SYMBOL_GPL(inet_hash); 
void inet_unhash(struct sock *sk)

{

	struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo;

	struct inet_listen_hashbucket *ilb;

	struct inet_listen_hashbucket *ilb = NULL;

	spinlock_t *lock;

	bool listener = false;



	if (sk_unhashed(sk))

		return;
@@ -635,7 +634,6 @@ void inet_unhash(struct sock *sk) 
	if (sk->sk_state == TCP_LISTEN) {

		ilb = &hashinfo->listening_hash[inet_sk_listen_hashfn(sk)];

		lock = &ilb->lock;

		listener = true;

	} else {

		lock = inet_ehash_lockp(hashinfo, sk->sk_hash);

	}
@@ -645,7 +643,7 @@ void inet_unhash(struct sock *sk) 


	if (rcu_access_pointer(sk->sk_reuseport_cb))

		reuseport_detach_sock(sk);

	if (listener) {

	if (ilb) {

		inet_unhash2(hashinfo, sk);

		 __sk_del_node_init(sk);

		 ilb->count--;