From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 20 Feb 2025 21:31:03 +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 1tlDCJ-004qHL-1o for lore@lore.pengutronix.de; Thu, 20 Feb 2025 21:31:02 +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 1tlDCI-0004Gn-Bv for lore@pengutronix.de; Thu, 20 Feb 2025 21:31:02 +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: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=vntQPwTed0Z0P1T3kCWS59bsmVnvLvN4EMVpYOP6qMo=; b=MY06QRu49bnJFaWA9pVFHU51kp QkVeFORsdVF3ywWRybMDgzb23woNWgASZkf5DZeQ1rwcNANJaOCShyFg6Brx5I+34sxYMQf9puXvD vJaa+KNoIL+LjPR5W85Cy3l2paYZMr2hArMQv5ZuxIgxeo1SPkPNMHCkqy6YgtC0C9mB7SdBE5Is1 +P4jPZ93G4ITpH8XWuo4g2XsppYKy3ltNyu1xF20I+Mr4SRs9Jt34Qx93ZHT3ARxyP5sO2nMWXkw9 P54GvYAipjzOkwKTWZ5hzM46/OXm/DDfQWDPvKjkka7PTzWd0dMxETgdTgQFJEjHqTxTfxLoPIkjb rEv32bFw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tlDBv-00000002nIB-1dxj; Thu, 20 Feb 2025 20:30:39 +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 1tlDBr-00000002nFq-46Xz for barebox@lists.infradead.org; Thu, 20 Feb 2025 20:30:37 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tlDBq-0003xM-Lq; Thu, 20 Feb 2025 21:30:34 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tlDBq-001zSB-1V; Thu, 20 Feb 2025 21:30:34 +0100 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1tlDBq-00E3gH-1E; Thu, 20 Feb 2025 21:30:34 +0100 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Thu, 20 Feb 2025 21:30:31 +0100 Message-Id: <20250220203032.3350247-5-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250220203032.3350247-1-a.fatoum@pengutronix.de> References: <20250220203032.3350247-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250220_123036_025408_2E77FCCC X-CRM114-Status: UNSURE ( 9.89 ) X-CRM114-Notice: Please train this message. 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.5 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: [PATCH 5/6] dummy_malloc: fail allocations exceeding MALLOC_MAX_SIZE 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) For uniformity with the proper allocators, let's observe the same maximum allocation size they do. Signed-off-by: Ahmad Fatoum --- common/dummy_malloc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/dummy_malloc.c b/common/dummy_malloc.c index 140ba314272a..4973f35650ab 100644 --- a/common/dummy_malloc.c +++ b/common/dummy_malloc.c @@ -11,8 +11,10 @@ void malloc_stats(void) void *memalign(size_t alignment, size_t bytes) { - void *mem = sbrk(bytes + alignment); + void *mem = NULL; + if (alignment <= MALLOC_MAX_SIZE && bytes <= MALLOC_MAX_SIZE) + mem = sbrk(bytes + alignment); if (!mem) { errno = ENOMEM; return NULL; -- 2.39.5