From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 19 Feb 2025 17:55:17 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tknLy-004NwO-1b for lore@lore.pengutronix.de; Wed, 19 Feb 2025 17:55:17 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tknLx-0006nc-C8 for lore@pengutronix.de; Wed, 19 Feb 2025 17:55:17 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=MEfsma8Uo3vyQVJUzForykjakuMMVllOoE2wliEC3s0=; b=NHJhb7mYAx6jR0V2CpYYmqTthv n7LSoBkNY7aV4sAHib/D3ITLlTBmhw+iHkWCIX4tewU1T8rPCOWs7ACljcWcNq1P8aNRkbWFF6P5Q 1t5VOP3/eURLGgUidhBjxO2Spl9KTPgAuCmILrbD646EJxTgi4kjMX376n2fgw5rF6JNKQE/4LI1b YnkdL3QxrPW149hHdC3yg+JfR4W097sZQXFSXXMp3f4dY31liaRlzpx8ODZFcrmIrcIIpGFymIJch mjCNWW2PPB5X1+nNZyAGAxSQRn5IGcS7FTxDf6yFIHZ9nsCKc5MBe4DrSHDrsKVJkNyj0U06SMCJP lSq2cz+w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tknLZ-0000000DxGv-1dqN; Wed, 19 Feb 2025 16:54:53 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tknLW-0000000DxFr-1RJl for barebox@lists.infradead.org; Wed, 19 Feb 2025 16:54:51 +0000 Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=[127.0.0.1]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1tknLV-0006hS-5s; Wed, 19 Feb 2025 17:54:49 +0100 Message-ID: <53d279f3-7cca-48e0-b688-b1ceb7d013fc@pengutronix.de> Date: Wed, 19 Feb 2025 17:54:48 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Sascha Hauer , Barebox List Cc: Jonathan Bar Or References: <20250219141844.1912413-1-s.hauer@pengutronix.de> <20250219141844.1912413-6-s.hauer@pengutronix.de> Content-Language: en-US From: Ahmad Fatoum In-Reply-To: <20250219141844.1912413-6-s.hauer@pengutronix.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250219_085450_384580_20B161F4 X-CRM114-Status: GOOD ( 18.04 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.3 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH 5/5] CVE-2025-26721: fs: pstore: fix malloc(size + constant) buffer overflow issues X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) On 19.02.25 15:18, Sascha Hauer wrote: > The pattern malloc(size + constant) is dangerous when size can be > manipulated by an attacker. In that case 'size' can be manipulated > in a way that 'size + constant' is 0 due to integer overflow. The > result is a zero sized buffer to which is then data written to. > > Avoid this by using struct_size() instead. > > Reported-by: Jonathan Bar Or > Signed-off-by: Sascha Hauer Reviewed-by: Ahmad Fatoum > --- > fs/pstore/fs.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/pstore/fs.c b/fs/pstore/fs.c > index 24b0fa5c9d..706c2d4684 100644 > --- a/fs/pstore/fs.c > +++ b/fs/pstore/fs.c > @@ -62,7 +62,7 @@ int pstore_mkfile(struct pstore_record *record) > return -EEXIST; > } > > - private = xzalloc(sizeof(*private) + size); > + private = xzalloc(struct_size(private, data, size)); > private->type = record->type; > private->id = record->id; > private->count = record->count; -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |