Commit 4de13d7e authored Mar 03, 2016 by Parthasarathy Bhuvaragan Committed by David S. Miller Mar 06, 2016

tipc: fix nullptr crash during subscription cancel



commit 4d5cfcba ('tipc: fix connection abort during subscription
cancel'), removes the check for a valid subscription before calling
tipc_nametbl_subscribe().

This will lead to a nullptr exception when we process a
subscription cancel request. For a cancel request, a null
subscription is passed to tipc_nametbl_subscribe() resulting
in exception.

In this commit, we call tipc_nametbl_subscribe() only for
a valid subscription.

Fixes: 4d5cfcba ('tipc: fix connection abort during subscription cancel')
Reported-by: Anders Widell <anders.widell@ericsson.com>
Signed-off-by: Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com>
Acked-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 11f7f79b

net/tipc/subscr.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -296,6 +296,7 @@ static void tipc_subscrb_rcv_cb(struct net *net, int conid,
		if (tipc_subscrp_create(net, (struct tipc_subscr *)buf, subscrb, &sub))
		return tipc_conn_terminate(tn->topsrv, subscrb->conid);

		if (sub)
		tipc_nametbl_subscribe(sub);
		}