From nobody Wed Feb 11 20:29:48 2026 X-Original-To: dev-commits-src-all@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 4fB95n5RX2z6S9Hh for ; Wed, 11 Feb 2026 20:29:49 +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 4fB95n3TQqz3HM6 for ; Wed, 11 Feb 2026 20:29:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770841789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pkbF8Q85ovJKw+2d2A/4+EXMzkm8NhwIsIHg7YBiWCU=; b=kfi/eD/+Tic4Co/7EYbYdkSv8rj26epeomqzGMq/JztFj1oXul/LqfMfjyW8jWThoNDoCn FuV/+xea3fgzQmqWRoQAKCGLuETXlCv4MeGT8YgMhBvWB6fC9tPD6SRVCAGlM66k1lck54 vjrV+A2uTcrzCVUGiX9Z98duQdbSDffYa/3gXK9SAQZUdrAwwQXgBow0FVVX8Mk79cUXrG J/h2oIfL2KyWPiy1V0TsBfALWnVCZKKqt+/gFQD8/8HR41z632QHCN5gavZ2QjZLe8o6mE uNozQMFXiZvjwr4Uu49CQOcP+hreNSL7sLeVtkzjrR07p13QfpwWMxPJ6r5SWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770841789; a=rsa-sha256; cv=none; b=Ds3j2YnKpAOBTKg1vBemU03piH1ttDXKU8p2NAUa6Ac8AvF/pmJwyXoVpWoaCT9Vv6NX3J ZsnOWNduECEt4EY3u67tMa24D7gMxcGwFQn80eCZAooAaw1/f4+yEyPnjJvK3i3jO4KjEM Vy43IP7UIKCanBIzRNo6bstmGjq6bt4qzcrP5HoDPyjg0C4Ta7c/hIuskfUf9VOKQ2pHCZ 51+C/ae0t0xTuBq6vjDVKlp2YQn5BmP6V4c8QfhGxoCojprPpy2vMboWuFaoaEjhWk4eg6 YGsW1y65rmuwodbjxwMIzCbIpEDD3e/xS+CZHyjR9agzHeTi9q+xeUsehtXzzw== 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=1770841789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pkbF8Q85ovJKw+2d2A/4+EXMzkm8NhwIsIHg7YBiWCU=; b=EKRS9hcrNrKAsi+N62yzKHKB63CKYoycubQBCXSz7+JjroM0Pl5pBFkVdpJAWJ8xP+JDew UhdvqkquP8Wd42KlWePwYjD3+YskIlcosqOz2ZqIh98t0YdbJiKKnLwt6cA+iy4d8RL7N8 IgPIt/Pi4VJIvzN+4XCnlSYtI1Q6OsuiUf+aANFkm489eE1+ZieUf9qOlYe9XjRrkKstrN 3Kxihmj0r4LJMAunlrQwdoOdpJMo2nqnYz1y/j1Yi/pzPy00IN6yHIRiEtdWrlQiaVWWAx TsE/LX/vy21ZKSfnheAQ4W45l4Q2qpzN5dXWnoD6TsvYuVJGykJdvqcpDuamAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB95m5mcbz13Lx for ; Wed, 11 Feb 2026 20:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 450cf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 20:29:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Zhenlei Huang From: Colin Percival Subject: git: 0671ffe268f2 - releng/14.4 - qlnxe: Prevent potential concurrency between ioctls List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 0671ffe268f2bff72356a2aba27c9965c9c403b4 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 20:29:48 +0000 Message-Id: <698ce6bc.450cf.346f4860@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0671ffe268f2bff72356a2aba27c9965c9c403b4 commit 0671ffe268f2bff72356a2aba27c9965c9c403b4 Author: Zhenlei Huang AuthorDate: 2026-02-06 17:52:53 +0000 Commit: Colin Percival CommitDate: 2026-02-11 20:29: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. Approved by: re (cperciva) Reviewed by: kbowling MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D54886 (cherry picked from commit 0df8a998a9fe28af659cb401c537c6d785e55f81) (cherry picked from commit 285b25c080faf71c60de36e834ef31cf70e6b50d) (cherry picked from commit 6e5b12acb66a9e269801b8d88c8f9838044d631c) --- 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: