]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
tipc: fix connection abort during subscription cancel
authorParthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com>
Wed, 27 Jan 2016 10:35:59 +0000 (11:35 +0100)
committerSasha Levin <sasha.levin@oracle.com>
Fri, 4 Mar 2016 15:25:47 +0000 (10:25 -0500)
commit257a04782588b4b97ac005a044f85947f792be44
treeb935fcdda44980d2599dccb3354139a3f175c36d
parent6e13e7b0183e0b9945ff350bd5fad573c2ece83c
tipc: fix connection abort during subscription cancel

[ Upstream commit 4d5cfcba2f6ec494d8810b9e3c0a7b06255c8067 ]

In 'commit 7fe8097cef5f ("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 7fe8097cef5f ("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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
net/tipc/subscr.c