From nobody Thu Mar 13 16:54:13 2025 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 4ZDD9f1srhz5qw30; Thu, 13 Mar 2025 16:54:14 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZDD9f0fGkz3fDZ; Thu, 13 Mar 2025 16:54:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741884854; 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=jL4YyZfAiVJGNdtFvISlNtUyTOC2VgP/Kn1X10Gfxio=; b=lBcGFcs8qcy5L/zizWpdXeGPivFO208kwxDOZtXIUlmNaWrqc0Dq7m48N94RvJfANrvwGj 6h84u6DfVL3YIkurlo6dCF3PwrfihjOld2IDAeKkml0QpEGmk6Bi773dRrvmyQoMBmN8JQ JwVwPKN5LeindwZ9jZ3PQ3aNfDzcZ1tjEWxsNJ9hrRlvKpoWS9EfbQQG7GyDbY6l4aaWDk NIQUiBIg89Ash2ZBZhGi9bQO2pPTNtl2dhFC1o5XfpibEBfH79qIDBTHdYfruBmrCDd5cs EN7dsBbtaJ9Z+3HJp6Kg8DlkcNLXcgVaSUwLsuruvyzQYboaJ5cC9OUdBUbQSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741884854; a=rsa-sha256; cv=none; b=oYXVrEpVf/mNsqqCdzTKk68GQe3HNEkA4BCqGIhkLvNy3FuetaQvuBHDVuIOtEShbJRjy4 yXRawN8FJ37oZlJoXjR/7113IxDzS4E9fXnm9ziuDAn+HQ0w7MiaCLjCwjf7k2VOJFHEbF hEtcD3YDEiixFlD6w8/AdU23QSZH3EMT3KPnGyb2M9wvy8RH81CR8QS5Wex4C7jpF7CD4l SEjDzUfYqnO7EzwCOSJjuJkvtB5ersP0gZbDnLPmwq0CCiFn1cEPTx2cjJx3tQujogvvFV 5N5mdun58GGgOEMg90ldEk83XfrIuNeuNk5E3GHkb7v8Okg7MyG7n1RDlg/ACQ== 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=1741884854; 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=jL4YyZfAiVJGNdtFvISlNtUyTOC2VgP/Kn1X10Gfxio=; b=Tueh8qCwiBnvGJW+KAAQfCOlSVxYyR9shsMzBi0OFxINRBe8gOiXPC4zzqzvMMHO4l2pXx 7Khtyq6A0CThHaJwVDRVz8gxPnT4Ll7jrpHDjQaYwE06cRBevscsyijIThUubPeW9Y2jKB i2Y+UduJ7BB0DmApn+FAFbiabqHp1x7ONafH+E+MnptpK3M1nMmFHDx1XYMqE9CUQ48jje K8w6Bj67XtGa6MpeIz8dxadmegukglJLMXJZqMRptyQYu6GkvhQat15BI+r/s8t3yadOxs zR/N+GU9TtnQFtTDzp7BHgpmbw3qILR/t785qOoCLk5WoHvkMi6Cj7hhJd+eVQ== 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 4ZDD9f0CpNz165x; Thu, 13 Mar 2025 16:54:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52DGsDRS043748; Thu, 13 Mar 2025 16:54:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52DGsDhq043745; Thu, 13 Mar 2025 16:54:13 GMT (envelope-from git) Date: Thu, 13 Mar 2025 16:54:13 GMT Message-Id: <202503131654.52DGsDhq043745@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: c56e75390e33 - main - inpcb: make sure we don't pass uninitialized faddr to in_pcbladdr() 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c56e75390e33d31f4e3d1d9d8725b3c293e2feba Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=c56e75390e33d31f4e3d1d9d8725b3c293e2feba commit c56e75390e33d31f4e3d1d9d8725b3c293e2feba Author: Gleb Smirnoff AuthorDate: 2025-03-13 16:53:40 +0000 Commit: Gleb Smirnoff CommitDate: 2025-03-13 16:53:40 +0000 inpcb: make sure we don't pass uninitialized faddr to in_pcbladdr() This very theoretical edge case was discovered by Coverity, not sure if it was introduced by 2af953b132ee or was there before. CID: 1593695 Fixes: 2af953b132ee8d2eb4d8d7bb15fc38bf04dde348 --- sys/netinet/in_pcb.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index a14792649519..9a49353f1538 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -1115,14 +1115,13 @@ in_pcbconnect(struct inpcb *inp, struct sockaddr_in *sin, struct ucred *cred) IA_SIN(CK_STAILQ_FIRST(&V_in_ifaddrhead))->sin_addr; if ((error = prison_get_ip4(cred, &faddr)) != 0) return (error); - } else if (sin->sin_addr.s_addr == INADDR_BROADCAST) { - if (CK_STAILQ_FIRST(&V_in_ifaddrhead)->ia_ifp->if_flags - & IFF_BROADCAST) - faddr = satosin(&CK_STAILQ_FIRST( - &V_in_ifaddrhead)->ia_broadaddr)->sin_addr; - else - faddr = sin->sin_addr; - } + } else if (sin->sin_addr.s_addr == INADDR_BROADCAST && + CK_STAILQ_FIRST(&V_in_ifaddrhead)->ia_ifp->if_flags + & IFF_BROADCAST) { + faddr = satosin(&CK_STAILQ_FIRST( + &V_in_ifaddrhead)->ia_broadaddr)->sin_addr; + } else + faddr = sin->sin_addr; } else faddr = sin->sin_addr;