From nobody Fri Nov 24 14:10:44 2023 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 4ScH2F1T4Dz52bDn; Fri, 24 Nov 2023 14:10:45 +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 4ScH2F0trvz3fmf; Fri, 24 Nov 2023 14:10:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700835045; 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=HThg+IG7Yf9E1AMdborCdwm//B4eq33YNMZDpHK0Z8M=; b=pXXUgkGE2XioX97o1L67SnronQWG+gpNj+W/BS+qr8QFhMafFJCIVChTeat47D59qgZTGO O83xhjkeK0cWNT77BgW8q2TFojUVInBGsBScrZMgiuOTn/FrnIGXzisYAkaPcjgHJsMEQk +FOL5UFbuZXQUK5A3DjulDpPjPjtUQ1LP2vnttAb0T9GQAaFnRrE/BlMxb0lx97SyxiGM+ rKd1SGXT8NaHK5j7dwYwGH75yUq+O5IHgYLskRZS24yNcd+5b8ZaqlaXklebdcUDX3sbiC 84AZ78PmnztwJakghuFA9bMEp8whUZxbE6r/Ba5+IbBgzqdC0MFHp2tkAmZAoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700835045; 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=HThg+IG7Yf9E1AMdborCdwm//B4eq33YNMZDpHK0Z8M=; b=js6pp6IVYuFZa9lkyxAP+9OwSmaQxCsUix1Oe5vs6fap8vk4yEwX7vzRanJb6wc4wJMpCJ ELDGXI919XwgdWHyyn1X0JvboifvEC6riemm6eU/r7s/RftnEZnI7aSfDfYxNQw3Ew8pLf OHzBLXyqSu4wg44VndAyazOcsiAnY1b8raJ5UEacDTkJq74ByH7hjOG5ReQIk+4ivJonGV ylKQ1gBqkB2ADfH2FGLcz88uf/s/HijEmU57Y2RuFmXYnsq+4QEMdTsshy/MrFQYUQm9FR JBw+rakfkHKksvERuWFSfWTDe7rIxf6lQHEOBWrofQ4oyYRBcFnwcT9hEyfazQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700835045; a=rsa-sha256; cv=none; b=HWrN2NI9wJuTLaHrAxFmswYi62w++Y2/FvUxdvmPLzkwn0YRU3ecjPWRoQsw2WJqwAyhzC 7keuWyuyavkZdLQfW41F9jQKjhTNHeuBA6mAvczTgkl3GWhWwpDT7BP463TQIIxo368C+O /JFovZEcomO5nPCLGvmh0DAgQLX9JloJb3wJ0wc5IabA3Q7zDTd8iB1u+a4GBSq7uwYvwv 5iLlggm+SifIr37spc39RXrGPjA15ae16AZ7RoSWCJvwpUX7mwcTYy+dZGsH21uxarqwEO wJQ2ZXX3vHwJ4AqG/hYs0bbYBk70Szz/+4B17gA0q6XSptJPKPvcbaLXhVYJrA== 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 4ScH2D75njzp1q; Fri, 24 Nov 2023 14:10:44 +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 3AOEAiar024763; Fri, 24 Nov 2023 14:10:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AOEAi9Y024760; Fri, 24 Nov 2023 14:10:44 GMT (envelope-from git) Date: Fri, 24 Nov 2023 14:10:44 GMT Message-Id: <202311241410.3AOEAi9Y024760@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 8423bf2a9e60 - stable/14 - libpfctl: handle allocation failure 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 8423bf2a9e60a12e5978ed453eb16533247fa25a Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8423bf2a9e60a12e5978ed453eb16533247fa25a commit 8423bf2a9e60a12e5978ed453eb16533247fa25a Author: Kristof Provost AuthorDate: 2023-11-17 09:14:59 +0000 Commit: Kristof Provost CommitDate: 2023-11-24 09:19:08 +0000 libpfctl: handle allocation failure While it's unlikely for userspace to fail to allocate memory it is still possible. Handle malloc() returning NULL. Reported by: Bill Meeks MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 33d55d0d0f33787e9e2796b5000be73af42573bc) --- lib/libpfctl/libpfctl.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 72da534ac1df..1ef96f52c19c 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -71,6 +71,11 @@ pfctl_do_ioctl(int dev, uint cmd, size_t size, nvlist_t **nvl) retry: nv.data = malloc(size); + if (nv.data == NULL) { + ret = ENOMEM; + goto out; + } + memcpy(nv.data, data, nvlen); nv.len = nvlen; @@ -190,6 +195,8 @@ _pfctl_get_status_counters(const nvlist_t *nvl, struct pfctl_status_counter *c; c = malloc(sizeof(*c)); + if (c == NULL) + continue; c->id = ids[i]; c->counter = counts[i];