From nobody Wed Jan 26 22:18:40 2022 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 3495B197034A; Wed, 26 Jan 2022 22:18:41 +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 4JkdR511m9z4mv4; Wed, 26 Jan 2022 22:18:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643235521; 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=1kLasZHVoPGDCQbFchrAE/tZOowM+ZRmxdnPuBzdMyQ=; b=c4rJC0NrSe8y1s1szC/GNOO1dP+WTE0NTyLWHvq09EdlVPWBkjlEga4VkHKk7ON2LHDpsr deODYPohwX9w2uvN+nqRSYbK56cZzs449vuKhiWM9Df76MD/mkRjZZHvqs9+blew6OwRVE 1XJET5UPfEwNImQA8b9PiyW2JYPT/LtFfKSKBz02BqT4coWC8tDU4t7RXT8rNsq5Vs+cj4 6sIx6NG3Oh89hLiBgiAU61yN+u5ghk0PcTG8HMtkjEGU4hsMl7TE141EGFK47R8CPTL51B cSFR0yU4YRxr2t9sId/0ltkbB+y4HvIFxtcZ6H21NdVZ25ZHmrASUako38Syyg== 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 02F672AAA; Wed, 26 Jan 2022 22:18:41 +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 20QMIe3J040961; Wed, 26 Jan 2022 22:18:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20QMIe9H040960; Wed, 26 Jan 2022 22:18:40 GMT (envelope-from git) Date: Wed, 26 Jan 2022 22:18:40 GMT Message-Id: <202201262218.20QMIe9H040960@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jilles Tjoelker Subject: git: 5a1a07f2a0e1 - main - sh: Don't add something to a null pointer 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: jilles X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a1a07f2a0e10179d38d8112fb5568e2b510b28c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643235521; 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=1kLasZHVoPGDCQbFchrAE/tZOowM+ZRmxdnPuBzdMyQ=; b=qWAZfRNqBq4ucZ68j0iOcaQu2Ou9y429oqz6auOWC2U3eQZ/iS4+0tymWKcKSHyDp9vN33 KLvx+1MN8ca+Co7znMrXNiBrksJ9m8yuXVVx4o/5Xd+0zo0PPKaHVSwtiMo9beQxZBxqM8 fdxJhz6qjg7CHuWDLnwG9ms78XCF/mNBXUR1T/nWGbLBcUiq7dAdMwacLkqJG0pj41pwnn UQqMyXfxms3GaVbsv5Z4QTVWADvNmV/rVjGeBJZozMGr6NSM00dgf0Hf8PERGf6iJ1cvCq kkmbX6lRn+MelwkzS45LWbo19jimBoTkjjqIkPfa4HaNTSFtfehp97U3dVxT0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643235521; a=rsa-sha256; cv=none; b=bzRhka9r12oAcQTgloxSn0OdEtYWD24whnZO79bXFubsj8LKwMjSiEK6k7bCCNHX5iK6Og ta02WPdy8E2SQqQOJxxP6U/Gza3yCX/W5Bmpn2zCNFqEOukhc71C33iMl2N/HfYgLCF2Dt iKZO5AolFgi2+CsgYd7S0ShnwEf096mAMwYV6CTYjVn8xGl7FV1Y0gZx5hlx9nsowH3Dmd OxEcbIh9e7AOW2dJ4mDPhCBFI//nSEdJV06Cmgsf57rvSuckKpeU32EKrhSyR6gn71o/SR pk3lOKDy3CiDXdokO3ifsj/NKlgH6+6UE6UCEjcE7k+9t3QzeUu/yHV8WRkvNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jilles: URL: https://cgit.FreeBSD.org/src/commit/?id=5a1a07f2a0e10179d38d8112fb5568e2b510b28c commit 5a1a07f2a0e10179d38d8112fb5568e2b510b28c Author: Jilles Tjoelker AuthorDate: 2022-01-23 21:15:57 +0000 Commit: Jilles Tjoelker CommitDate: 2022-01-26 22:13:20 +0000 sh: Don't add something to a null pointer Pointer arithmetic on a null pointer is undefined behavior. The bug can be reproduced by running bin/sh/tests/builtins/wait6.0 with UBSAN. Reported by: Mark Millard Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D34011 --- bin/sh/jobs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c index c0ba7d75e16d..ff36bfa6d999 100644 --- a/bin/sh/jobs.c +++ b/bin/sh/jobs.c @@ -587,6 +587,8 @@ waitcmdloop(struct job *job) return retval; } } else { + if (njobs == 0) + return 0; for (jp = jobtab ; jp < jobtab + njobs; jp++) if (jp->used && jp->state == JOBDONE) { if (! iflag || ! jp->changed)