From nobody Wed Feb 11 13:49:06 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fB0CR4nyzz6RVGn for ; Wed, 11 Feb 2026 13:49:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB0CR0YyDz3ZkJ for ; Wed, 11 Feb 2026 13:49:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770817747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mj/jrPqTpyrFvGUHgK71zA2Sku6bqUvY8xXEUTVKSkA=; b=ey3WJJtzRic21eTnCEfvFIZsJ3/OpjhWD//zyyRdiOqGnwJtNTmsTt8O9cgKR50MilLv1Z 6+X3eFT1eZo5Xi8jbyuBFzEDbh34OxDZuoloTdsm+4BVXTTJpf0Yky6FCpizxyy7s9VWz1 3P4EZnMiwM2EjWgoBVAsHIQfA7xxoyjuF66GRKPtNWNVwh426OajZQWTYwLEljpF3YNm+e ZRlZP76mBbFK8sdoqUPuLTArupMVwMR71wQrjkI0vNGt8S3uZExnYHn6P5L39mHmV/FRuU 3YhPb+ZEpJh9Vp3Gaqo2S+sbBIJcyA9v6QlauqE5CaIzcncT7JZtvfmPb43djg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770817747; a=rsa-sha256; cv=none; b=iSD+p/gxHbqPUhK5IXNGGmaUOyrWKPs4LwO5HN/6ObFuDxbXKA/zZc5JYdRUUVQwlpLT93 Qnr6RhkvpqqvOvSRRdtsC+f9hDFsF7oiO24kj7vmUi2/1gbz75+HzR+gWXIm9IA/MrRxQY Vqyrk4/r+v+A7l2u0SFD0VO4xymxX/xddCrNVZudz5gHB5TtcRh6hVbHXZJYgGBPlFYLIA abVjo+z1kArn0hwem43W/WUc6ieXHpsepBlXNziQapqiyPK4+f9H2jQrOM3Wm7aYpTBQgb r3jW4z+4xtesl8a11b3AvRCOU32T5ecbAUv2t92opW8zL8c6yqjPHaBN3pBf/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770817747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mj/jrPqTpyrFvGUHgK71zA2Sku6bqUvY8xXEUTVKSkA=; b=dm0qAFWWaZoMaZBpRGNVaifsEiAcQEDPi347jn0EMw1mru9TzLfmFAfLrQO0S+HsioVmDm fchRIyJ2kZu/te8xpowwkHfA7hR4kW2s2oeLN59ckiyfocYnVhBJY4fSNn6+Qng6PjP2s+ OEnYmT7HK0JQi9J/WozFcn+4jtU4T2FNWgqNGc6K2fRyP1TF+dfLhcJHzJYcdE8PoeM2kz cGk/G6TbtprCQnPp9kZUZVwyZ9FPpOedqGWwO0vYMEYk3m5qLX6CjReIqtYSHy7CcXZ0eY 1bluCVvMGArkSQIi4tS1WpuLAwan67rPU24F3jhecKGZjyEWzIX/Ns1w9ajf3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB0CQ2m58zshp for ; Wed, 11 Feb 2026 13:49:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3be13 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 13:49:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 6e5b12acb66a - stable/14 - qlnxe: Prevent potential concurrency between ioctls List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6e5b12acb66a9e269801b8d88c8f9838044d631c Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 13:49:06 +0000 Message-Id: <698c88d2.3be13.26ff64b6@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=6e5b12acb66a9e269801b8d88c8f9838044d631c commit 6e5b12acb66a9e269801b8d88c8f9838044d631c Author: Zhenlei Huang AuthorDate: 2026-02-06 17:52:53 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-11 13:48:07 +0000 qlnxe: Prevent potential concurrency between ioctls The driver-managed status flags should be lock protected to be touched. Also this can serialize ioctls those check the IFF_DRV_RUNNING status. Reviewed by: kbowling MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D54886 (cherry picked from commit 0df8a998a9fe28af659cb401c537c6d785e55f81) (cherry picked from commit 285b25c080faf71c60de36e834ef31cf70e6b50d) --- sys/dev/qlnx/qlnxe/qlnx_os.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index ec2fd7cacfae..b0dac3a82582 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -2568,9 +2568,7 @@ qlnx_set_multi(qlnx_host_t *ha, uint32_t add_multi) mcnt = if_foreach_llmaddr(ifp, qlnx_copy_maddr, mta); - QLNX_LOCK(ha); qlnx_hw_set_multi(ha, mta, mcnt, add_multi); - QLNX_UNLOCK(ha); return (0); } @@ -2637,11 +2635,10 @@ qlnx_ioctl(if_t ifp, u_long cmd, caddr_t data) #ifdef INET if (ifa->ifa_addr->sa_family == AF_INET) { if_setflagbits(ifp, IFF_UP, 0); - if (!(if_getdrvflags(ifp) & IFF_DRV_RUNNING)) { - QLNX_LOCK(ha); + QLNX_LOCK(ha); + if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0) qlnx_init_locked(ha); - QLNX_UNLOCK(ha); - } + QLNX_UNLOCK(ha); QL_DPRINT4(ha, "SIOCSIFADDR (0x%lx) ipv4 [0x%08x]\n", cmd, ntohl(IA_SIN(ifa)->sin_addr.s_addr)); @@ -2703,19 +2700,23 @@ qlnx_ioctl(if_t ifp, u_long cmd, caddr_t data) case SIOCADDMULTI: QL_DPRINT4(ha, "%s (0x%lx)\n", "SIOCADDMULTI", cmd); - if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) { + QLNX_LOCK(ha); + if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0) { if (qlnx_set_multi(ha, 1)) ret = EINVAL; } + QLNX_UNLOCK(ha); break; case SIOCDELMULTI: QL_DPRINT4(ha, "%s (0x%lx)\n", "SIOCDELMULTI", cmd); - if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) { + QLNX_LOCK(ha); + if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0) { if (qlnx_set_multi(ha, 0)) ret = EINVAL; } + QLNX_UNLOCK(ha); break; case SIOCSIFMEDIA: