From: KOSAKI Motohiro <kosaki.motohiro@gmail.com>
To: libc-alpha@sourceware.org, libc-ports@sourceware.org
Cc: KOSAKI Motohiro <kosaki.motohiro@gmail.com>
Subject: [PATCH 3/4] tst-chk1: add fd_set dynamic allocation test
Date: Fri, 12 Apr 2013 05:34:00 -0000 [thread overview]
Message-ID: <1365744803-19197-4-git-send-email-kosaki.motohiro@gmail.com> (raw)
In-Reply-To: <1365744803-19197-1-git-send-email-kosaki.motohiro@gmail.com>
---
ChangeLog | 5 +++++
debug/tst-chk1.c | 25 +++++++++++++++++++++++++
2 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0ca0a47..4b80b8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,11 @@
* debug/tst-lfschk7.c: Likewise.
* debug/Makefile: Added tst-chk7.c and tst-lfschk7.c.
+ * debug/tst-chk1.c (do_test): Added tests for fd_set allocation
+ from heap.
+
+2013-03-29 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
* sysdeps/unix/sysv/linux/i386/nptl/libc.abilist:
Add __fdelt_check and __fdelt_check_warn.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libc.abilist:
diff --git a/debug/tst-chk1.c b/debug/tst-chk1.c
index 4ca0596..54016c5 100644
--- a/debug/tst-chk1.c
+++ b/debug/tst-chk1.c
@@ -1451,6 +1451,7 @@ do_test (void)
#endif
fd_set s;
+ fd_set *pfdset;
FD_ZERO (&s);
FD_SET (FD_SETSIZE - 1, &s);
#if __USE_FORTIFY_LEVEL >= 1 && _STRICT_FD_SIZE_CHECK >= 1
@@ -1458,18 +1459,42 @@ do_test (void)
FD_SET (FD_SETSIZE, &s);
CHK_FAIL_END
#endif
+#if __USE_FORTIFY_LEVEL >= 1 && !(_STRICT_FD_SIZE_CHECK >= 1)
+ pfdset = (fd_set*)calloc(howmany(FD_SETSIZE+1, NFDBITS), sizeof(fd_mask));
+ if (pfdset == NULL) {
+ printf("malloc failed %m\n");
+ return 1;
+ }
+ FD_SET (FD_SETSIZE, pfdset);
+#endif
FD_CLR (FD_SETSIZE - 1, &s);
#if __USE_FORTIFY_LEVEL >= 1 && _STRICT_FD_SIZE_CHECK >= 1
CHK_FAIL_START
FD_CLR (FD_SETSIZE, &s);
CHK_FAIL_END
#endif
+#if __USE_FORTIFY_LEVEL >= 1 && !(_STRICT_FD_SIZE_CHECK >= 1)
+ pfdset = (fd_set*)calloc(howmany(FD_SETSIZE+1, NFDBITS), sizeof(fd_mask));
+ if (pfdset == NULL) {
+ printf("malloc failed %m\n");
+ return 1;
+ }
+ FD_CLR (FD_SETSIZE, pfdset);
+#endif
FD_ISSET (FD_SETSIZE - 1, &s);
#if __USE_FORTIFY_LEVEL >= 1 && _STRICT_FD_SIZE_CHECK >= 1
CHK_FAIL_START
FD_ISSET (FD_SETSIZE, &s);
CHK_FAIL_END
#endif
+#if __USE_FORTIFY_LEVEL >= 1 && !(_STRICT_FD_SIZE_CHECK >= 1)
+ pfdset = (fd_set*)calloc(howmany(FD_SETSIZE+1, NFDBITS), sizeof(fd_mask));
+ if (pfdset == NULL) {
+ printf("malloc failed %m\n");
+ return 1;
+ }
+ FD_ISSET (FD_SETSIZE, pfdset);
+#endif
struct pollfd fds[1];
fds[0].fd = STDOUT_FILENO;
--
1.7.1
next prev parent reply other threads:[~2013-04-12 5:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-12 5:33 [PATCH v3 0/4] fix wrong program abort on __FD_ELT KOSAKI Motohiro
2013-04-12 5:34 ` KOSAKI Motohiro [this message]
2013-04-12 5:34 ` [PATCH 2/4] Reinstantiate fd range check if and only if defined _STRICT_FD_SIZE_CHECK=1 KOSAKI Motohiro
2013-04-12 5:34 ` [PATCH 4/4] __FDS_BITS: Added cast to __fd_mask* to avoid warning KOSAKI Motohiro
2013-04-12 5:34 ` [PATCH 1/4] __fdelt_chk: Removed range check KOSAKI Motohiro
2013-04-12 7:42 ` Florian Weimer
2013-04-12 20:28 ` KOSAKI Motohiro
2013-04-14 0:40 ` KOSAKI Motohiro
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=1365744803-19197-4-git-send-email-kosaki.motohiro@gmail.com \
--to=kosaki.motohiro@gmail.com \
--cc=libc-alpha@sourceware.org \
--cc=libc-ports@sourceware.org \
/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).