]> git.proxmox.com Git - mirror_ubuntu-kernels.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)
committerDavid S. Miller <davem@davemloft.net>
Fri, 29 Jan 2016 20:14:21 +0000 (15:14 -0500)
commit4d5cfcba2f6ec494d8810b9e3c0a7b06255c8067
treec96b685f7e864b832eb3685157b082823876e0fc
parent286af315d3f153595ce718fb1e442891f14ed5c0
tipc: fix connection abort during subscription cancel

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>
net/tipc/subscr.c