From nobody Mon Jul 31 22:56:45 2023 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 4RFFmh6n5Cz4pbk8; Tue, 1 Aug 2023 00:07:22 +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 4RFDBn2LZVz3PY7; Mon, 31 Jul 2023 22:56:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690844210; 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=ft1CMto6tf/b+fKx+73ZXOEXzPE+fnWboZtdwi6JD5s=; b=fLZ2wb1qcl8Dhc9FLTQDhWDxX6BYHb0xaGC+wvkJJhfld2lyDSJ8xauOwvIRCxCy4KYavn F+WK2BiWef9QQCxm0OiWNifGVBzCQnoR+6sGVyZPfjpGqY5yrZ4QNJK+TD38+Hz0+RzYK+ D6k98wu6M3TJg+0ilnApm289JFEOEvZ1esYd5tEQuMvPNghQpyP9rVNc/RxQ4wzu42EdaV G/r0fA8518biEryc+Hip5nDo3g7iwUnVQVLU1sBwYdpNrRyvub0QX9WVQ5WLI3kpvCl+4i qhVIKt0lJEhlpsxwGdf3fXesS4YLjPclmdksL9fTh7beSsUaxhT8Hg0v1eRJog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690844210; 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=ft1CMto6tf/b+fKx+73ZXOEXzPE+fnWboZtdwi6JD5s=; b=l+shfkZJ2nvA3FfHQevs54CLZxD5IL7JeVgxjaaRrDJiFcNE6/A4Ftfc72ZsvIfXufsD4T Gr5h5RT6FBdmnWoIF2deeVoqAR4Sr120IDPjiy1emC5LO7xDsGhRO+PIF8z3xFl9TilBem CtoEHY/x6/iRE0e7rfkLBxX/LnCE6HLgC7k5HkLkvm1z+TukzNHoQtFt3b/wLMobzNq+0A lv2DebKVeGugG+FHY3NGLUliE3uGNWDbRkxyuj1ZCD1B16j9oHB2DkPiitML8No4dD0BA3 o+M4ePvKQqODTjJi+ezMCRcp9BQ5g+5vQPi9Zahlg/d75z8RR5qkmRkZXEpZEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690844210; a=rsa-sha256; cv=none; b=oB2n8LXqpQKHtaQE5MdejmRY2drYmh5Nkj8jAtOv2uQ/MqP+RvizG1CNyexsObA/09PYQk WtLjRO+8RbaIFaI/YDQsuB+M6IZM+o1D32y6rjXReo+o+wWESPwSuR5zy3CjhgHJ+oIOYk CeEgRqAckNo5VRnBZlpBLQVWuqYugp+fO7gspwuyooq5xo1Vqbx68eg8stB0RfTmQlrIEv AF/vMGu2WoFzOKBvOa+LShPG8X+C8ivjKdq8nUpTexIz7Arq7N/PS5qAVenoSA+uealuG0 4ICDmXRyoO1O83LpjorC+8f2reTHRWTKgIPPRqvXdaMUjbUBHtjXHWSeyKuzGQ== 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 4RFDBl08YrzDjH; Mon, 31 Jul 2023 22:56:46 +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 36VMujXZ006652; Mon, 31 Jul 2023 22:56:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VMujAC006651; Mon, 31 Jul 2023 22:56:45 GMT (envelope-from git) Date: Mon, 31 Jul 2023 22:56:45 GMT Message-Id: <202307312256.36VMujAC006651@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: fa3cf6cdc68c - main - cd9660: do not leak buffers in cd9660_rrip_loop() 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa3cf6cdc68cb6d6f2c440f2653258d68eae1015 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fa3cf6cdc68cb6d6f2c440f2653258d68eae1015 commit fa3cf6cdc68cb6d6f2c440f2653258d68eae1015 Author: Konstantin Belousov AuthorDate: 2023-07-31 22:55:13 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-31 22:55:13 +0000 cd9660: do not leak buffers in cd9660_rrip_loop() Reported by: Robert Morris PR: 272856 Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/fs/cd9660/cd9660_rrip.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c index 26a09f9be383..21b176a3f0f6 100644 --- a/sys/fs/cd9660/cd9660_rrip.c +++ b/sys/fs/cd9660/cd9660_rrip.c @@ -520,12 +520,18 @@ cd9660_rrip_loop(struct iso_directory_record *isodir, ISO_RRIP_ANALYZE *ana, } if (ana->fields && ana->iso_ce_len) { - if (ana->iso_ce_blk >= ana->imp->volume_space_size - || ana->iso_ce_off + ana->iso_ce_len > ana->imp->logical_block_size - || bread(ana->imp->im_devvp, - ana->iso_ce_blk << - (ana->imp->im_bshift - DEV_BSHIFT), - ana->imp->logical_block_size, NOCRED, &bp)) + if (ana->iso_ce_blk >= ana->imp->volume_space_size || + ana->iso_ce_off + ana->iso_ce_len > + ana->imp->logical_block_size) + break; + if (bp != NULL) { + brelse(bp); + bp = NULL; + } + if (bread(ana->imp->im_devvp, + ana->iso_ce_blk << + (ana->imp->im_bshift - DEV_BSHIFT), + ana->imp->logical_block_size, NOCRED, &bp) != 0) /* what to do now? */ break; phead = (ISO_SUSP_HEADER *)(bp->b_data + ana->iso_ce_off);