From nobody Tue Jul 2 19:58:47 2024 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 4WDDHq2Tltz5PCwD; Tue, 02 Jul 2024 19:58:47 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WDDHq1vnpz4hK9; Tue, 2 Jul 2024 19:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719950327; 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=nIlMDalocunDJ9WpaMi1DC2rKLTcwzBuh4HkfcsWlPc=; b=s3SLHU/n4gie2eR7ud0G1/eAceG+cMF11KYkPSsP8smhc1LLYfMZLcrcE9Vzemmm1S+4sH bbra4ptRHkMz4rFbdbR4eFYPpq5RwiOLf0XAaBXA/hjGAQPPAXmzEZ/B97HtUNMqRFCc1b 9op7nl/eu0ie6s7yFVmwUPws3c88TJYrQxTmxXnz0IL5wZSP+x4Sm2R96jZQp6wLi30jpl CQmk4+y+vjs/HYQa4ePZvU+d9HTip476aWSiq/iNZjWjWNMRzM3qN6Z0JBni0CAVXFKZtr EJdAlN8ucwFx8QzMGVdZc3CdogcNLtzHP1+RozLbRPixQr4IB8BJA/XGnfTP5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719950327; a=rsa-sha256; cv=none; b=LXcMMOO10jlu7t0UzxxlNYGKmhu4j8t2wTUVdrxSFVGXg5baftZj1GQkkeKp5UU4mwtJuy wNV2oom9x3kgYluCiLyk2h0wH+Z5tUpWgxv8F+eMOB5hTe+L8gEgwnIW4McfYntVkMuiNj 0rsKUXyQZdaRPfy5WBoio8R0a5XL5ssZVqtI+h48o0vZL/9BfuSGigehbQAtJMDsclEDzF 5cs5SJ4u6OzYJONLfLtm3qglHs1g/wt21fs3GjBBYIcvVe4/+zeuTVG2uSQb4alPSPptLd HiV+uJO2IjfoEz5P77IBLlU+JQWVj3pJLOh409CruX2Ff+uhpOM7tF0hJJJU2w== 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=1719950327; 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=nIlMDalocunDJ9WpaMi1DC2rKLTcwzBuh4HkfcsWlPc=; b=ZQWEHbFy0Veh6tCqDwtAcZ/YrZxoVRAxBx58R4dll6IGR8ys0BQIdfJaUoPOZGRoXUiHOz XkGUdCvsmB3Iy+rCamAy6LVc/ZkKHxkHKVpQO7qIwWSTHoQn2Mi3FoABW9/xgEaxPN6BY7 YLFcmVEjML5yE0jqzxVzVs1Q4E3M/Zo2xpfXi+mH1/8JeR86FyaBk0KDHmx6CYDLxmHrPw n8xUowggKIJha8vo9USxIOHHPAUGmrJnH6akzrxFoW3kQaQkPUbXuj4jTwh4sH79+iv5hx V7HxV3HEJTqIjoInVKr8dGTpZj9eZNvLTtHrXur5B/vPZUJVJQrYPSvx7yr8wg== 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 4WDDHq1PLWz11Z6; Tue, 2 Jul 2024 19:58:47 +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 462Jwlpl081337; Tue, 2 Jul 2024 19:58:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 462JwlxL081334; Tue, 2 Jul 2024 19:58:47 GMT (envelope-from git) Date: Tue, 2 Jul 2024 19:58:47 GMT Message-Id: <202407021958.462JwlxL081334@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 78918c9b271c - main - pf: Fix NULL deref in m_pullup failure case 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78918c9b271cb71419111abb5780f8a5adb4f2f5 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=78918c9b271cb71419111abb5780f8a5adb4f2f5 commit 78918c9b271cb71419111abb5780f8a5adb4f2f5 Author: Igor Ostapenko AuthorDate: 2024-07-02 17:36:28 +0000 Commit: Kristof Provost CommitDate: 2024-07-02 19:58:32 +0000 pf: Fix NULL deref in m_pullup failure case Reviewed by: glebius, kp Differential Revision: https://reviews.freebsd.org/D45832 --- sys/netpfil/pf/pf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 4ad0a9a1336a..21647bd733f8 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8085,8 +8085,7 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, if (m->m_len < sizeof(struct ip) && (m = *m0 = m_pullup(*m0, sizeof(struct ip))) == NULL) { DPFPRINTF(PF_DEBUG_URGENT, - ("pf_test: m_len=%d < sizeof(struct ip), pullup failed\n", - m->m_len)); + ("pf_test: m_len < sizeof(struct ip), pullup failed\n")); PF_RULES_RUNLOCK(); return (PF_DROP); }