From nobody Fri Nov 11 18:36:58 2022 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 4N86qv1lKWz4dbcW; Fri, 11 Nov 2022 18:36:59 +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 4N86qv0q6rz3wJ7; Fri, 11 Nov 2022 18:36:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668191819; 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=a2PKc46M+lTZabpXZjCHybqGUc8jtOe1CEfnGbi9/ok=; b=oQJAr5BEZM+q8w8K3NrpRdajzsjG9pBVwUyJI7En4C/rVPXVTcqPea7bc68mHSUr+U/PGA uqY3FPeDBVVOuO0q7TZ608bFtcmsgFz1WIaONLRCUkSJm3g+9msN5v8T5vXcIvdmpGudUK Dk+TbL47MtjnFq8m+UuJRbJbk6K/KrPKLvlPs2IWLdkOHlr+zP28OsBRx28QgnM9X9c/Ur V82OY6BhVxq2HmCJUXwTVGQlrHIDKdJw+GlpbDnv9x6RrisA5RINmfGXVBKxkUa7IY50SF 5/KdbUecr85l7K88BrZ7fukFliAmc7skDA5PdMmQvnP2bGZW4aXZyMPStft/ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668191819; 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=a2PKc46M+lTZabpXZjCHybqGUc8jtOe1CEfnGbi9/ok=; b=kwPX3xli3Dy9MOM6Ovd/AgXvf8PuJ5hTrLR9ECX2NByQbjKBsM3WrXNA4907hfHUy8uR6y GPshpCB3G7O1F5hWyhq7piw0rVE1ZfG4F5MNun0qroCVtK+9aRnvEVT7xRaR75rCEidHmj o91dKAuO9szdItFaSTi4Coi0Hr+vq3Kf3FjzH9dFnMQb/iFe/2kh3LfXSHIp6ssmD+4DCw lO8t9m76EnLknq2VRPaxtNBop4bXPT4m6g9cp+3tyoTJTuNwdpNB21kmXOg+IrZtZ8QSF0 W3SKHIxrwYgkIwuUtPAWQ/nNJBtaW+qI5OWybZN4VFeike3dnSAq8gIJefrhcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668191819; a=rsa-sha256; cv=none; b=yQAcjUf7oSThRfZ5AzyTP6KobcGhjrlJ1MDkh4SdlnF2jyUdeCkSm0wjHQhCTsvSgPNfc0 GBRKuRZDYKtzaVhx18Y0OtwO5gycyiFNyMud1emojKnHUs0kFfqlzY4uDpgMohkyL2gJ1d JyfcJqA9slpE2MJEBlDMy+l416YcTs+VPICOIOVKJx/08oPioJSa2fKprEUM/VoYjD7waj TnAqf53SDxDISH6iSGgZKJx4gV6/41KkE2pOyohlq7E69CuTjA1VR77+ro5XAnw4+FXSTc FvLWyXdcVgOFqcvI4qcBti0XNo8XkQezOBUZS3PGfM4ll+R8bveaEaIiShUewg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N86qt71KTztHK; Fri, 11 Nov 2022 18:36:58 +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 2ABIawvf004312; Fri, 11 Nov 2022 18:36:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ABIaw0Q004311; Fri, 11 Nov 2022 18:36:58 GMT (envelope-from git) Date: Fri, 11 Nov 2022 18:36:58 GMT Message-Id: <202211111836.2ABIaw0Q004311@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 7597246911f8 - stable/13 - nvmecontrol wdc: Don't pass a bogus pointer to free(). 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7597246911f89d29294be46d2d3c84b215d3a4e9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7597246911f89d29294be46d2d3c84b215d3a4e9 commit 7597246911f89d29294be46d2d3c84b215d3a4e9 Author: John Baldwin AuthorDate: 2022-10-03 23:10:44 +0000 Commit: John Baldwin CommitDate: 2022-11-11 18:18:54 +0000 nvmecontrol wdc: Don't pass a bogus pointer to free(). wdc_get_dui_log_size allocates a buffer and then advances the returned pointer. Passing this advanced pointer to free() is UB, so save the original pointer to pass to free() instead. Reviewed by: imp Reported by: GCC 12 -Wfree-nonheap-object Differential Revision: https://reviews.freebsd.org/D36827 (cherry picked from commit 1187e46d1b3833b9b54867a5587904c451369515) --- sbin/nvmecontrol/modules/wdc/wdc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/nvmecontrol/modules/wdc/wdc.c b/sbin/nvmecontrol/modules/wdc/wdc.c index a60f72942186..1cae15a1e54c 100644 --- a/sbin/nvmecontrol/modules/wdc/wdc.c +++ b/sbin/nvmecontrol/modules/wdc/wdc.c @@ -268,7 +268,7 @@ static void wdc_get_dui_log_size(int fd, uint32_t opcode, uint8_t data_area, uint64_t *log_size, int len_off) { - uint8_t *hdr; + uint8_t *hdr, *tofree; uint8_t max_sections; int i, j; uint16_t hdr_ver; @@ -277,7 +277,7 @@ wdc_get_dui_log_size(int fd, uint32_t opcode, uint8_t data_area, dui_size = 0; len = 1024; - hdr = (uint8_t*)malloc(len); + tofree = hdr = (uint8_t*)malloc(len); if (hdr == NULL) errx(EX_OSERR, "Can't get buffer to read header"); wdc_get_data_dui(fd, opcode, len, 0, hdr, len); @@ -315,7 +315,7 @@ wdc_get_dui_log_size(int fd, uint32_t opcode, uint8_t data_area, errx(EX_PROTOCOL, "ERROR : No valid header "); *log_size = dui_size; - free(hdr); + free(tofree); } static void