From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 13447 invoked from network); 1 Aug 2020 14:26:56 -0000 Received: from mother.openwall.net (195.42.179.200) by inbox.vuxu.org with ESMTPUTF8; 1 Aug 2020 14:26:56 -0000 Received: (qmail 5799 invoked by uid 550); 1 Aug 2020 14:26:54 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Reply-To: musl@lists.openwall.com Received: (qmail 5769 invoked from network); 1 Aug 2020 14:26:53 -0000 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dereferenced.org; s=default; t=1596292002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=z6GRyxnF5UnXEOZM5/PVIkgVxaWjfYaFjpTpT8pZDuc=; b=Vtzw5hYCl3IAhw3cCUhFNZxxyApm0oedKyw3kaeLqc8yt6gQbyeGm9gcYlyfqn3DK+N4VJ KyyyajrId6jrnhpyT6zIa32KTNMWUC0AnevT9KPti0Dil9Ftv+xxisLk8Sh3zq96M8zz8x fqnPxy1SGdUWjyH3tSxcY7Usgic5TjA= From: Ariadne Conill To: musl@lists.openwall.com Cc: Ariadne Conill Date: Sat, 1 Aug 2020 08:26:35 -0600 Message-Id: <20200801142635.30086-1-ariadne@dereferenced.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [musl] [PATCH v4] implement reallocarray(3) reallocarray(3) is an extension introduced by OpenBSD, which introduces calloc(3) overflow checking to realloc(3). glibc 2.28 introduced support for this function behind _GNU_SOURCE, while glibc 2.29 allows its usage in _DEFAULT_SOURCE. musl makes it available under _BSD_SOURCE, which is equivalent to _DEFAULT_SOURCE. --- include/stdlib.h | 1 + src/malloc/reallocarray.c | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 src/malloc/reallocarray.c diff --git a/include/stdlib.h b/include/stdlib.h index 194c2033..b54a051f 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -145,6 +145,7 @@ int getloadavg(double *, int); int clearenv(void); #define WCOREDUMP(s) ((s) & 0x80) #define WIFCONTINUED(s) ((s) == 0xffff) +void *reallocarray (void *, size_t, size_t); #endif #ifdef _GNU_SOURCE diff --git a/src/malloc/reallocarray.c b/src/malloc/reallocarray.c new file mode 100644 index 00000000..4a6ebe46 --- /dev/null +++ b/src/malloc/reallocarray.c @@ -0,0 +1,13 @@ +#define _BSD_SOURCE +#include +#include + +void *reallocarray(void *ptr, size_t m, size_t n) +{ + if (n && m > -1 / n) { + errno = ENOMEM; + return 0; + } + + return realloc(ptr, m * n); +} -- 2.28.0