From: Li Wang <liwang@redhat.com>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH v2 1/2] lib: add SAFE_CALLOC macro
Date: Tue, 30 Apr 2024 13:28:44 +0800 [thread overview]
Message-ID: <20240430052845.31039-1-liwang@redhat.com> (raw)
Signed-off-by: Li Wang <liwang@redhat.com>
---
include/tst_safe_macros.h | 5 +++++
lib/tst_safe_macros.c | 15 +++++++++++++++
2 files changed, 20 insertions(+)
diff --git a/include/tst_safe_macros.h b/include/tst_safe_macros.h
index 53aceb5ca..f228b99e1 100644
--- a/include/tst_safe_macros.h
+++ b/include/tst_safe_macros.h
@@ -75,6 +75,11 @@ int safe_dup2(const char *file, const int lineno, int oldfd, int newfd);
#define SAFE_MALLOC(size) \
safe_malloc(__FILE__, __LINE__, NULL, (size))
+void *safe_calloc(const char *file, const int lineno, size_t nmemb, size_t size);
+
+#define SAFE_CALLOC(nmemb, size) \
+ safe_calloc(__FILE__, __LINE__, (nmemb), (size))
+
void *safe_realloc(const char *file, const int lineno, void *ptr, size_t size);
#define SAFE_REALLOC(ptr, size) \
diff --git a/lib/tst_safe_macros.c b/lib/tst_safe_macros.c
index c6e6b15dc..40fdaca76 100644
--- a/lib/tst_safe_macros.c
+++ b/lib/tst_safe_macros.c
@@ -9,6 +9,7 @@
#include <stdlib.h>
#include <errno.h>
#include <sched.h>
+#include <malloc.h>
#include <sys/ptrace.h>
#include "config.h"
#ifdef HAVE_SYS_FANOTIFY_H
@@ -546,6 +547,20 @@ int safe_dup2(const char *file, const int lineno, int oldfd, int newfd)
return rval;
}
+void *safe_calloc(const char *file, const int lineno, size_t nmemb, size_t size)
+{
+ void *rval;
+
+ rval = calloc(nmemb, size);
+
+ if (rval == NULL) {
+ tst_brk_(file, lineno, TBROK | TERRNO,
+ "calloc(%zu, %zu) failed", nmemb, size);
+ }
+
+ return rval;
+}
+
void *safe_realloc(const char *file, const int lineno, void *ptr, size_t size)
{
void *ret;
--
2.40.1
--
Mailing list info: https://lists.linux.it/listinfo/ltp
next reply other threads:[~2024-04-30 5:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-30 5:28 Li Wang [this message]
2024-04-30 5:28 ` [LTP] [PATCH v2 2/2] kallsyms01: Utilize ksymbol table for unauthorized address access Li Wang
2024-04-30 5:36 ` Li Wang
2024-05-02 10:29 ` Cyril Hrubis
2024-05-06 3:21 ` Li Wang
2024-05-02 10:31 ` [LTP] [PATCH v2 1/2] lib: add SAFE_CALLOC macro Cyril Hrubis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240430052845.31039-1-liwang@redhat.com \
--to=liwang@redhat.com \
--cc=ltp@lists.linux.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).