Commit 4d5cfcba authored Jan 27, 2016 by Parthasarathy Bhuvaragan Committed by David S. Miller Jan 29, 2016

tipc: fix connection abort during subscription cancel



In 'commit 7fe8097c ("tipc: fix nullpointer bug when subscribing
to events")', we terminate the connection if the subscription
creation fails.
In the same commit, the subscription creation result was based on
the value of the subscription pointer (set in the function) instead
of the return code.

Unfortunately, the same function tipc_subscrp_create() handles
subscription cancel request. For a subscription cancellation request,
the subscription pointer cannot be set. Thus if a subscriber has
several subscriptions and cancels any of them, the connection is
terminated.

In this commit, we terminate the connection based on the return value
of tipc_subscrp_create().
Fixes: commit 7fe8097c ("tipc: fix nullpointer bug when subscribing to events")

Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 286af315

net/tipc/subscr.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -289,15 +289,14 @@ static void tipc_subscrb_rcv_cb(struct net *net, int conid,
		struct sockaddr_tipc addr, void usr_data,
		void *buf, size_t len)
		{
		struct tipc_subscriber *subscriber = usr_data;
		struct tipc_subscriber *subscrb = usr_data;
		struct tipc_subscription *sub = NULL;
		struct tipc_net *tn = net_generic(net, tipc_net_id);

		tipc_subscrp_create(net, (struct tipc_subscr *)buf, subscriber, &sub);
		if (sub)
		if (tipc_subscrp_create(net, (struct tipc_subscr *)buf, subscrb, &sub))
		return tipc_conn_terminate(tn->topsrv, subscrb->conid);

		tipc_nametbl_subscribe(sub);
		else
		tipc_conn_terminate(tn->topsrv, subscriber->conid);
		}

		/* Handle one request to establish a new subscriber */