From nobody Tue Aug 08 18:13:19 2023 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 4RL1Wz5C0Hz4pvJh; Tue, 8 Aug 2023 18:13:19 +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 4RL1Wz4jhjz4ZJB; Tue, 8 Aug 2023 18:13:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691518399; 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=ld7SdPvd6kwzTLkfceTt9myLzDU5CI0SELAbashFPvY=; b=EtoO4LGwm9qWLLHxiu+sye2mh1cy8t9xZyrHGrDUoV7K5Z6PcAW4nT05tjinHX8fPHQ7Kx yMRepoi+ojH2Sj8DiQQPpWNyUHqtOgQtnOhkNuazxxJTm9qwxgN+jmw7WmsHMpOQKeuJXi 58VI+QSD/cGbiNfKhuFM8UerRzCO36VqXdYBDxHwmY47RJATSnHIq/sYkK2wzzsjEPcsBL kdMEqaIj9GnsPy/FUC40BCBL5HgD6AScIoT/eDA9641VUWVj8KwBMIyAW3cd2Lx5arwwnf FL9bPgpTDykNynaubuq650/8r7Gzh55yFyuU0FUsNVIhwnMUC1O7EkEjcbx+dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691518399; 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=ld7SdPvd6kwzTLkfceTt9myLzDU5CI0SELAbashFPvY=; b=Io0oVOUOhgBM/+QJeefRpSI1WCkQfNahluvNKqYL0i3iAd+FZOJxFmOKWYtXQ+WfXiXhi3 Wo1iVkBM/j4dhqQJsiIP9PyrF23gA+WXqL2os0VYm3xEfc7ASbd9nZyDC2zFoxRbLEZpkU kaCRPpIvvLZXFOfqPA+SYrPLzhoyHifgGSGNVoQWI3g6BfDkekb/q4HbP2QHmjkW/dahYM 8hXXCos989GtH2igQxYIlWWmrJ6WPxSmHmqX3W9HtNRGbAA+DkvU4K7PYf5DRVajPmSpwC fQwxKM5VJRRCIV+k8/yD6oAk5bByH+CfFwWWsoGmAyq8h2K28IMovC/BBdsGAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691518399; a=rsa-sha256; cv=none; b=rfYZafmNfmILy9P9cYZ5jUADP0d63zE4lLvxdU4fCbj4tRqlQQZ4WfNA2c661fguJUyyg8 w9etdRZAhtGz5ZD5TEIG8jIkc9SO2qSIOGzfeOSRFxYTZ7CiLp7inXlyOz+t506OpdYm++ 7DAy9xGFo6T5X2CpL26vTX1swekGTk0qEdZNB35CqIDf9SGpwXbFBiNieZjd5Uy2JQTvAo WjWxhVzE4SssnIa7+HDu7LD4d68YTu07xuACTGBUuoDraHYKi8k3W2Pk1lmA2rYhfeISpR Fotgo5HUZRyMw47tZY2E5r4FesKw56kWDGhEVXeb3shsd1Y1T8WSp7GUs1IN8w== 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 4RL1Wz3nvzzkxp; Tue, 8 Aug 2023 18:13:19 +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 378IDJQB006895; Tue, 8 Aug 2023 18:13:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378IDJCo006894; Tue, 8 Aug 2023 18:13:19 GMT (envelope-from git) Date: Tue, 8 Aug 2023 18:13:19 GMT Message-Id: <202308081813.378IDJCo006894@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 2030f99a9aac - stable/12 - cd9660: do not leak buffers in cd9660_rrip_loop() 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 2030f99a9aac92b06e16f0f21a3307df8ee90acd Auto-Submitted: auto-generated The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2030f99a9aac92b06e16f0f21a3307df8ee90acd commit 2030f99a9aac92b06e16f0f21a3307df8ee90acd Author: Konstantin Belousov AuthorDate: 2023-07-31 22:55:13 +0000 Commit: Ed Maste CommitDate: 2023-08-08 18:12:29 +0000 cd9660: do not leak buffers in cd9660_rrip_loop() PR: 272856 (cherry picked from commit fa3cf6cdc68cb6d6f2c440f2653258d68eae1015) (cherry picked from commit 746c8f0cd7061bcda4bb68cb612827288459bee6) --- 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 55833ea73dd5..1cae8463e8f6 100644 --- a/sys/fs/cd9660/cd9660_rrip.c +++ b/sys/fs/cd9660/cd9660_rrip.c @@ -553,12 +553,18 @@ cd9660_rrip_loop(isodir,ana,table) } 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);