From nobody Sun Nov 26 04:07:59 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 4SdFYr0Lh8z52kF5; Sun, 26 Nov 2023 04:08:00 +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 4SdFYq55Bjz3Fxd; Sun, 26 Nov 2023 04:07:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971679; 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=+3dJXcvFNX37C2GUL/Pli/SvzE5U6+n//aCNToFaRrM=; b=NsKpT4hioBGzYeT67s4WMs8Qg5+gWupVPb9qerWhNphKN8in/wAamJaCcRx7OLGby0OEvH KMzgveKiZpbZUyH1nTR4MYXUWBAMaljk8zi36A5Yk9sxMhKP14uNM2RP3k5b2xP0+XvUgF jaLcEfVBDOzfEHZLDFwmE2nWXTFIqcqnwbnZ6fNf1S/9aBIOYhjpUsJg9eYONa50SSnzgs hXid+5+zTEh4FXIV6g8BmZAEPkcXjlqo0qsrgE+eNpx8X3/a+iZogzBJHkgGN1f6VYFZGU fx6leJHvz9wZFZPj1PJ32oleeMagV5NBKuUQ5HcquRuwS8JEYQbfS3pF5pjD/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971679; 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=+3dJXcvFNX37C2GUL/Pli/SvzE5U6+n//aCNToFaRrM=; b=KRzO4TS+1zZZtEx7l5vTqYubqyq3iqM60IyLctttKziyINyDbihbVeeKU8K8H/sI02lPLQ 3rmsCnIQJqdoWcFCL8Zedc27baZ1692Ga7+SPupx9YeJe7U+mSJ2CiW2TAXa566mGEHXFQ Gqy5AX3tTHjNURCWJ08A8+n9VxAf+EbpLkxYQM0zDe8CQDzUJcuLRX4Wh66aF+M1zb1SNC cyLsJRvkK9TGheMMyVlpbU3sXbPoIJp4hTB3zT41EYk7gCTvC9n0eAsixw5d4AF6MBHnTp TkYnyX0GreVDtsbDNH5fQAASq/Jmj/Qm6en+cRdprjL1vL/EV65mz44Ct0OiIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700971679; a=rsa-sha256; cv=none; b=htAz0xXaPt8pPqFFOCP+uxZTe//b1V35UgH88/LJf6DKWG3iH+OHCVICpi3UZQAuLhHQzn SNrGyO1YcIPQ6Otd976QVv4W5TJZZ1w4zNiT8LRQ9gRZRRmjMHuOSO1okPHZLz7zqyTSBM DPvMfzk5Aci3nhQBsCcJEl5aM9XwFP/5GTc6yW9Ll/zOUaor1o73OaOwNpja/+1mo2oLzA 7yca33z+awKKVFODb/88/xd2HEeTx+VehSNS2NkyHvskPy5dv/ycj4XSXZ6p45Hn5TRGke x6L6SSeWnynWtKgcf7XKuXfGod4SLmzy1vuoEgQZkd0ykCKFEU/MIQV6xObXRg== 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 4SdFYq3kd0zh28; Sun, 26 Nov 2023 04:07:59 +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 3AQ47xSU028906; Sun, 26 Nov 2023 04:07:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ47xJO028903; Sun, 26 Nov 2023 04:07:59 GMT (envelope-from git) Date: Sun, 26 Nov 2023 04:07:59 GMT Message-Id: <202311260407.3AQ47xJO028903@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 9c170b3d52bf - stable/13 - grep: don't rely on implementation-defined malloc(0) behavior 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9c170b3d52bf8e7ca3c14e6788330e79329fcf0b Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=9c170b3d52bf8e7ca3c14e6788330e79329fcf0b commit 9c170b3d52bf8e7ca3c14e6788330e79329fcf0b Author: Kyle Evans AuthorDate: 2023-11-05 02:08:36 +0000 Commit: Kyle Evans CommitDate: 2023-11-26 04:07:17 +0000 grep: don't rely on implementation-defined malloc(0) behavior The very few places that rely on malloc/calloc of a zero-size region won't attempt to dereference it, so just return NULL rather than rolling the dice with the underlying malloc implementation. Reported by: brooks, Shawn Webb (cherry picked from commit e116e040f3091eca914a06dcd0bdd9f1aea23add) --- usr.bin/grep/util.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c index 68bfd504279e..e3cf6e3cb4d8 100644 --- a/usr.bin/grep/util.c +++ b/usr.bin/grep/util.c @@ -650,6 +650,8 @@ grep_malloc(size_t size) { void *ptr; + if (size == 0) + return (NULL); if ((ptr = malloc(size)) == NULL) err(2, "malloc"); return (ptr); @@ -663,6 +665,8 @@ grep_calloc(size_t nmemb, size_t size) { void *ptr; + if (nmemb == 0 || size == 0) + return (NULL); if ((ptr = calloc(nmemb, size)) == NULL) err(2, "calloc"); return (ptr);