From: John Wang Date: Tue, 30 Jul 2024 08:46:35 +0000 (+0800) Subject: net: mctp: Consistent peer address handling in ioctl tag allocation X-Git-Tag: v6.12-rc1~232^2~341 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5fcf0801ef5c8adb785520f16b4a1faa8c4ac147;p=thirdparty%2Flinux.git net: mctp: Consistent peer address handling in ioctl tag allocation When executing ioctl to allocate tags, if the peer address is 0, mctp_alloc_local_tag now replaces it with 0xff. However, during tag dropping, this replacement is not performed, potentially causing the key not to be dropped as expected. Signed-off-by: John Wang Reviewed-by: Jeremy Kerr Link: https://patch.msgid.link/20240730084636.184140-1-wangzhiqiang02@ieisystem.com Signed-off-by: Jakub Kicinski --- diff --git a/net/mctp/af_mctp.c b/net/mctp/af_mctp.c index de52a9191da0e..43288b408fde3 100644 --- a/net/mctp/af_mctp.c +++ b/net/mctp/af_mctp.c @@ -486,6 +486,9 @@ static int mctp_ioctl_droptag(struct mctp_sock *msk, bool tagv2, tag = ctl.tag & MCTP_TAG_MASK; rc = -EINVAL; + if (ctl.peer_addr == MCTP_ADDR_NULL) + ctl.peer_addr = MCTP_ADDR_ANY; + spin_lock_irqsave(&net->mctp.keys_lock, flags); hlist_for_each_entry_safe(key, tmp, &msk->keys, sklist) { /* we do an irqsave here, even though we know the irq state,