summaryrefslogtreecommitdiff
path: root/net/mctp
diff options
context:
space:
mode:
authorMatt Johnston <matt@codeconstruct.com.au>2021-10-14 11:10:50 +0300
committerDavid S. Miller <davem@davemloft.net>2021-10-15 13:22:08 +0300
commit0b93aed2842d950e8d2625e975e5a57febeff33d (patch)
tree69a36266a237fb8f644c999888d9cf40abd3f450 /net/mctp
parentbf1366734b362c7da4933760c4f42c278ce843fa (diff)
downloadlinux-0b93aed2842d950e8d2625e975e5a57febeff33d.tar.xz
mctp: Avoid leak of mctp_sk_key
mctp_key_alloc() returns a key already referenced. The mctp_route_input() path receives a packet for a bind socket and allocates a key. It passes the key to mctp_key_add() which takes a refcount and adds the key to lists. mctp_route_input() should then release its own refcount when setting the key pointer to NULL. In the mctp_alloc_local_tag() path (for mctp_local_output()) we similarly need to unref the key before returning (mctp_reserve_tag() takes a refcount and adds the key to lists). Fixes: 73c618456dc5 ("mctp: locking, lifetime and validity changes for sk_keys") Signed-off-by: Matt Johnston <matt@codeconstruct.com.au> Reviewed-by: Jeremy Kerr <jk@codeconstruct.com.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mctp')
-rw-r--r--net/mctp/route.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mctp/route.c b/net/mctp/route.c
index 04781459b2be..82fb5ae524f6 100644
--- a/net/mctp/route.c
+++ b/net/mctp/route.c
@@ -372,6 +372,7 @@ static int mctp_route_input(struct mctp_route *route, struct sk_buff *skb)
trace_mctp_key_acquire(key);
/* we don't need to release key->lock on exit */
+ mctp_key_unref(key);
key = NULL;
} else {
@@ -584,6 +585,9 @@ static int mctp_alloc_local_tag(struct mctp_sock *msk,
trace_mctp_key_acquire(key);
*tagp = key->tag;
+ /* done with the key in this scope */
+ mctp_key_unref(key);
+ key = NULL;
rc = 0;
}