From nobody Tue Apr 16 04:35:50 2024 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 4VJWSQ38VMz5Hm5P; Tue, 16 Apr 2024 04:35:50 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VJWSQ10HBz4YQc; Tue, 16 Apr 2024 04:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713242150; 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=pOJYFXAoKHaJGv2bAyI3JWM3fBJDOn1NCRh28ZPNFIM=; b=m7/cvpgoBVkoh0RRJjT8p6SRhnZ7keXfwBSZ8r6PDkjpkTN+Cv7fYlQTPcbY43BDnXwHY6 RO5G2KOI2FeTPCgy7aKKXI00VBB1jgqdVIfIFyzqca6Oi1jC33LXjfzPGbAsgiCceFUh0V ZJ1RNgMorwIdpuILiZoDBIPs+UkPmVp+xWPWItkIcAfmXCUTyeCjPInRFyyha20U5nww7e /XrecOSOusacBit5ydOZjdA9qea7Fi3etdFq/9LZCcYkwDYbYkiRuK22xoxlm08z2qiy5w cTsKIQ5LNQ+5IAv3bXivzmbfpzU/ceHJ5LU7h+3bLh8beq7FGimQMjKiKNaiAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713242150; a=rsa-sha256; cv=none; b=ytJPxJfJCL0YNChEj1wrraJB5qD0ywF4WxP3vcKz61sBf/A6UvSCOqzdFM+Cs7z2Bp9y0G E2xujaFqf1ldrPPbqOSCzP7kM7hhDPxN5SF6SOecAMBnET1qssZoy99St6dpDr7AO/Zdal DfQyfScMcZOgv8q9yH+WyZwjliXSkfdM99D6gHoVQu94r0hVOzWBPWmCNJIwwTVq7IVndL FL8a1VAoFwmgLfolzayIapcwUNe6r6JfS8UQ3mrgy3vUpz1aC99Y9mEMDuSCis5t31dNxn Xz6Tbtihohoz4DPW8kZ1MtdaEessR7T5+9IY5yZIhsX2/Ctrpc4ZYWcoW5oB5w== 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=1713242150; 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=pOJYFXAoKHaJGv2bAyI3JWM3fBJDOn1NCRh28ZPNFIM=; b=YcQ4FfSnRDlPaqWo+fCGN12Bfd2hIlFR7Snub8F3Hz0tRRCBYoqjglp9wLimrvCR8W5zGW Tk83vj6IWHd4RPkC/De2yebl7tUbJ9hh1Tqdz+byTjlJdSr9cfQXAY1j7+C/YZb+EfOamx bcV3Pf2V/KDnDSGs5mjeoBKvfk/QofExbVSRMNG0HaiPJziM+irAQzqw+iK+9KPoE7Ux01 RUpPsY8baMCA3xpc3jXq3Dr7iP+RlIu+MsJ+mXWaPXPDVodj9yRhcQaKAaR4/9TwciEKLN mfecCKnveUhXqAljKz8QyWbIwF/QhPLnxIc+B0vMIl0Px5Gp2EIg4/pgLhrCfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJWSQ0bKrzT3T; Tue, 16 Apr 2024 04:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43G4ZoCB043097; Tue, 16 Apr 2024 04:35:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43G4ZoDZ043094; Tue, 16 Apr 2024 04:35:50 GMT (envelope-from git) Date: Tue, 16 Apr 2024 04:35:50 GMT Message-Id: <202404160435.43G4ZoDZ043094@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 2e8d60c68540 - stable/14 - ng_socket: Treat EEXIST from kern_kldload() as success 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: 2e8d60c6854006a391491bc2c1c48c459c32e2c4 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=2e8d60c6854006a391491bc2c1c48c459c32e2c4 commit 2e8d60c6854006a391491bc2c1c48c459c32e2c4 Author: Zhenlei Huang AuthorDate: 2024-04-09 10:04:47 +0000 Commit: Zhenlei Huang CommitDate: 2024-04-16 04:34:56 +0000 ng_socket: Treat EEXIST from kern_kldload() as success EEXIST is possible in a race condition. Inspired by: ffc72591b1f5 (Don't worry if a module is already loaded ...) Reviewed by: glebius MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44633 (cherry picked from commit f6f67f58c19db4f25f5c2cf4869efc7054493a55) --- sys/netgraph/ng_socket.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/netgraph/ng_socket.c b/sys/netgraph/ng_socket.c index 4afa46c3d0f0..0b38f0176bfc 100644 --- a/sys/netgraph/ng_socket.c +++ b/sys/netgraph/ng_socket.c @@ -285,11 +285,15 @@ ngc_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr, if (ng_findtype(mkp->type) == NULL) { char filename[NG_TYPESIZ + 3]; int fileid; + bool loaded; /* Not found, try to load it as a loadable module. */ snprintf(filename, sizeof(filename), "ng_%s", mkp->type); error = kern_kldload(curthread, filename, &fileid); + loaded = (error == 0); + if (error == EEXIST) + error = 0; if (error != 0) { free(msg, M_NETGRAPH_MSG); goto release; @@ -298,9 +302,10 @@ ngc_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr, /* See if type has been loaded successfully. */ if (ng_findtype(mkp->type) == NULL) { free(msg, M_NETGRAPH_MSG); - (void)kern_kldunload(curthread, fileid, - LINKER_UNLOAD_NORMAL); - error = ENXIO; + if (loaded) + (void)kern_kldunload(curthread, fileid, + LINKER_UNLOAD_NORMAL); + error = ENXIO; goto release; } }