From nobody Fri Feb 6 17:59:29 2026 X-Original-To: dev-commits-src-main@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 4f720d6jXPz6RVv5 for ; Fri, 06 Feb 2026 17:59:29 +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 4f720d4BS3z4KVq for ; Fri, 06 Feb 2026 17:59:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770400769; 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=Jnm9QN+IPV9jB0PGqYr+a6vxHpeV8UxxeDWmD+HZPEI=; b=BODJu6B7gBvIb/jSWNDYDagoktO6iFf9E6eiIs3M4Y4Q8MlKCmijYlMi7dUwaPA40dYm0O t9tE+DYPiRIR/vT4ZH3UjJBqYAMubXiu9/NgyordCccLnbB29mZ1xAM6hagm1kEzu/Jjs+ ad+SpYgB6DNBHl/OHJS+pAJrR6izmuKpxRPx1NIkjzymhU6CZIM4k091SXaTyDKRNBwlyv oCYTXlqN0uhPEh/wcCpfUKUR0RHTnlwkV0uCnWzWBJU+r47Nr+hbYdtl9nt7R8BUFGiJEe j9zmx4p8FxcuBLw6nst75eXbkI6Oz0e1ZTjsZSZ7YZHELR6jJo/c9+ZPWTebNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770400769; a=rsa-sha256; cv=none; b=TGoXUnL3ttei6ifYBp9bJQ8gg2iSETJS/l8l0ZWRzgtB3YS5DFPp1xpYUQebhmWFAaKENW 7tWVPnDzC8wHXkU15rQh6+t75aqVVuULCcZOnKLB86F1LsV86FDazogMm4CVj5sF+WvL87 JJ+zOiW4flDtsZI+Rx3xhqP7BRYeDnbpmMxnSaX+U2e9TCP9je+2Lfae51KlzpsiNpjyLt OAGUvu4iDdmmhiWyIZpVYROnSmRy49BCVQRLVmVptGjUX9Jayfc4ItQf2YbFGwNInXJiNX XOfa/T+Fc4tOFLIzngjQUpeSdu9RiyZBcz9LYTCLTFNt/oWq5rYKDhrelPbMBg== 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=1770400769; 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=Jnm9QN+IPV9jB0PGqYr+a6vxHpeV8UxxeDWmD+HZPEI=; b=UQCgx3tMYyNth8VhUJNSY2YqjCcVm8QHESadKG7z1z457jhgUtqoVMJIqsUTZTvq4keCil ZG8hpunsaHTpwYVYfSdKKhYXfNzXNxRcV+YGekH0EcSUqbJfKEnFG3FrUs2XKlIlHAODAL HgJlIx5z00wjiqJ2jxxXcJ0Ajk/vM8fyiVuIA/87pQFZQtZSeWlXpdWKm7jUB2wtFXbAn3 aDL5gVnY5n/6XfA3e1IeVYWstusxkJEmZmThu7hVsfEHUJOZxpLdRn2nTO8xiKW//DgPfR WAYQJyPdOul3mw3xqyFfGc1IVBDt/jtPU2dBQ1LIHJhsuupEHQSC1SpqI7Up1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f720d3L2qz9Qp for ; Fri, 06 Feb 2026 17:59:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 301b2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 17:59:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 0df8a998a9fe - main - qlnxe: Prevent potential concurrency between ioctls List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 0df8a998a9fe28af659cb401c537c6d785e55f81 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 17:59:29 +0000 Message-Id: <69862c01.301b2.4a06c215@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=0df8a998a9fe28af659cb401c537c6d785e55f81 commit 0df8a998a9fe28af659cb401c537c6d785e55f81 Author: Zhenlei Huang AuthorDate: 2026-02-06 17:52:53 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-06 17:52:53 +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 --- 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: