From nobody Thu Dec 02 19:16:13 2021 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 4D1E918B14DD; Thu, 2 Dec 2021 19:16: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J4lzx5xZcz4TNM; Thu, 2 Dec 2021 19:16:13 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 8496A22C26; Thu, 2 Dec 2021 19:16:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B2JGDfq009629; Thu, 2 Dec 2021 19:16:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B2JGD4C009628; Thu, 2 Dec 2021 19:16:13 GMT (envelope-from git) Date: Thu, 2 Dec 2021 19:16:13 GMT Message-Id: <202112021916.1B2JGD4C009628@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: 3cce6164ab9b - main - ip_input: remove pointless check in INP_RECVIF handling 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 3cce6164ab9bb5a8ba569e2ae0e14099b6db46fd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638472574; 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=0ZFJh6afLPnqKReKj+AnExubaWJe7gI1saKCdvMpNzg=; b=Gkro7F7/27VAMhLqlyU2H6cRkXWmTY0LJr57iL4KK1+aH1+CCbabIhUCVfk+2/nN7J7i3G qsVnlPFZ3m25ZrnxVUw4eYiAxxwU/Rdjv8igxDpAkWSCrcu+fr3E1Ko6Vj/SXKMA8cKZ7r rSnGWW6uY8FXGN9wlNuAFG8SjS5DYb1pQ0WHvYaGUa2IoUR+6uwxqyoHqG1Z5rOvp6Ylmy 9wxtdAzP2m4RvqMo00BpSfP5/KENNanV0Lln8RQFlNK9RaWnqkJHFoV9QTmpBm2Oyrq8C+ cf0cyChTD3refEm/9HC04K2082qi+R6GEOsZFpQT421rgH/3IiuoFNva8mSzQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638472574; a=rsa-sha256; cv=none; b=jfodRtwkiJGKpvM80NxX0PhhPWQ5Cf7ACJuJ5A1sesSs7FhYKqQjuSm8GkiYAnvRHYF1CR x+lcM7R4UkUdSg/r9yYfG4iE9H30S8VLX3qVwk77hdl3RtEbt2ElynndtBg0Oz5F5dfQz/ 8SJNNF77QQTW+BL42F8v1RyJLoi+JuzzOs2CDWl6aCO/OeYJdxGnpPpy2zXcA1F0aJcIT1 7xbhiS2onyUR8oPMXXwRIy05Cn0MD34qqcN5JmACbOfUo8OuHt6pJt/6BhfGALS9iiquP5 DhAEgl0Q2ERkMwrDXjYhNom0GiOXN5jUwojrbD3IR6HMaW2XtaIicbjbnhu6ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=3cce6164ab9bb5a8ba569e2ae0e14099b6db46fd commit 3cce6164ab9bb5a8ba569e2ae0e14099b6db46fd Author: Gleb Smirnoff AuthorDate: 2021-12-02 19:15:04 +0000 Commit: Gleb Smirnoff CommitDate: 2021-12-02 19:15:04 +0000 ip_input: remove pointless check in INP_RECVIF handling An mbuf rcvif pointer is supposed to be valid and doesn't need extra checks. The code appeared in d314ad7b73639. --- sys/netinet/ip_input.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 9db1f8c6f2e7..44500c46b0d8 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -1281,8 +1281,7 @@ ip_savecontrol(struct inpcb *inp, struct mbuf **mp, struct ip *ip, struct sockaddr_dl *sdp; struct sockaddr_dl *sdl2 = &sdlbuf.sdl; - if ((ifp = m->m_pkthdr.rcvif) && - ifp->if_index && ifp->if_index <= V_if_index) { + if ((ifp = m->m_pkthdr.rcvif)) { sdp = (struct sockaddr_dl *)ifp->if_addr->ifa_addr; /* * Change our mind and don't try copy.