diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-02-22 15:24:56 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-02-22 15:29:26 -0800 |
| commit | fecc51559a844b7f74119159c3cdb25b80b4e2c6 (patch) | |
| tree | 2cf1e49810eb0c58e552f722cc2ab2742e62cf43 /net/mctp | |
| parent | 0fb848d1a41e0d3895cb157810862db6046063dd (diff) | |
| parent | 6714ebb922ab15a209dfc3c1ed29d4bb0abc9f02 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
Conflicts:
net/ipv4/udp.c
f796feabb9f5 ("udp: add local "peek offset enabled" flag")
56667da7399e ("net: implement lockless setsockopt(SO_PEEK_OFF)")
Adjacent changes:
net/unix/garbage.c
aa82ac51d633 ("af_unix: Drop oob_skb ref before purging queue in GC.")
11498715f266 ("af_unix: Remove io_uring code for GC.")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/mctp')
| -rw-r--r-- | net/mctp/route.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mctp/route.c b/net/mctp/route.c index 34e513113509..40dd64c9e618 100644 --- a/net/mctp/route.c +++ b/net/mctp/route.c @@ -721,7 +721,7 @@ struct mctp_sk_key *mctp_alloc_local_tag(struct mctp_sock *msk, spin_unlock_irqrestore(&mns->keys_lock, flags); if (!tagbits) { - kfree(key); + mctp_key_unref(key); return ERR_PTR(-EBUSY); } |