Commit 8dd7903e authored by Sunil Mushran's avatar Sunil Mushran Committed by Linus Torvalds

fs/ocfs2/cluster/tcp.c: fix possible null pointer dereferences

Fix some possible null pointer dereferences that were detected by the
static code analyser, smatch.
Signed-off-by: default avatarSunil Mushran <sunil.mushran@oracle.com>
Reported-by: default avatarDan Carpenter <error27@gmail.com>
Reported-by: default avatarGuozhonghua <guozhonghua@h3c.com>
Cc: Sunil Mushran <sunil.mushran@gmail.com>
Cc: Joseph Qi <joseph.qi@huawei.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7e9b7937
...@@ -543,8 +543,9 @@ static void o2net_set_nn_state(struct o2net_node *nn, ...@@ -543,8 +543,9 @@ static void o2net_set_nn_state(struct o2net_node *nn,
} }
if (was_valid && !valid) { if (was_valid && !valid) {
printk(KERN_NOTICE "o2net: No longer connected to " if (old_sc)
SC_NODEF_FMT "\n", SC_NODEF_ARGS(old_sc)); printk(KERN_NOTICE "o2net: No longer connected to "
SC_NODEF_FMT "\n", SC_NODEF_ARGS(old_sc));
o2net_complete_nodes_nsw(nn); o2net_complete_nodes_nsw(nn);
} }
...@@ -1695,13 +1696,12 @@ static void o2net_start_connect(struct work_struct *work) ...@@ -1695,13 +1696,12 @@ static void o2net_start_connect(struct work_struct *work)
ret = 0; ret = 0;
out: out:
if (ret) { if (ret && sc) {
printk(KERN_NOTICE "o2net: Connect attempt to " SC_NODEF_FMT printk(KERN_NOTICE "o2net: Connect attempt to " SC_NODEF_FMT
" failed with errno %d\n", SC_NODEF_ARGS(sc), ret); " failed with errno %d\n", SC_NODEF_ARGS(sc), ret);
/* 0 err so that another will be queued and attempted /* 0 err so that another will be queued and attempted
* from set_nn_state */ * from set_nn_state */
if (sc) o2net_ensure_shutdown(nn, sc, 0);
o2net_ensure_shutdown(nn, sc, 0);
} }
if (sc) if (sc)
sc_put(sc); sc_put(sc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment