diff options
| author |   Ying Xue <ying.xue@windriver.com> | 2014-08-28 10:02:41 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-08-29 20:22:43 -0700 |
| commit | cc086fcf92996965f0dcf05c6641d65381705266 (patch) | |
| tree | f8c0f6ddc1da64e55a483d097df168571a560f14 | |
| parent | net: phy: properly report internal PHYs through sysfs (diff) | |
| download | linux-dev-cc086fcf92996965f0dcf05c6641d65381705266.tar.xz linux-dev-cc086fcf92996965f0dcf05c6641d65381705266.zip | |
tipc: fix a potential oops
Commit 6c9808ce09f7 ("tipc: remove port_lock") accidentally involves
a potential bug: when tipc socket instance(tsk) is not got with given
reference number in tipc_sk_get(), tsk is set to NULL. Subsequently
we jump to exit label where to decrease socket reference counter
pointed by tsk pointer in tipc_sk_put(). However, As now tsk is NULL,
oops may happen because of touching a NULL pointer.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Acked-by: Erik Hugne <erik.hugne@ericsson.com>
Acked-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/tipc/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index d416e83ce069..75275c5cf929 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -2118,9 +2118,9 @@ static void tipc_sk_timeout(unsigned long ref) tsk = tipc_sk_get(ref); if (!tsk) - goto exit; - sk = &tsk->sk; + return; + sk = &tsk->sk; bh_lock_sock(sk); if (!tsk->connected) { bh_unlock_sock(sk); |