diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | rt/Makefile | 2 | ||||
| -rw-r--r-- | rt/tst-mqueue4.c | 12 | ||||
| -rw-r--r-- | rt/tst-mqueue7.c | 2 | ||||
| -rw-r--r-- | rt/tst-mqueue9.c | 92 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mq_unlink.c | 10 |
6 files changed, 128 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index aa1351ae12..f31e2ac626 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2004-04-19 Jakub Jelinek <jakub@redhat.com> + + * sysdeps/unix/sysv/linux/mq_unlink.c (mq_unlink): Change EPERM into + EACCES. + * rt/Makefile (tests): Add tst-mqueue9. + * rt/tst-mqueue9.c: New test. + * rt/tst-mqueue4.c (do_test): Add test for mq_unlink of a too long + name component. + +2004-04-19 Ulrich Drepper <drepper@redhat.com> + + * rt/tst-mqueue7.c (do_test): Make newargv const. + 2004-04-18 Randolph Chung <tausq@debian.org> * sysdeps/hppa/elf/entry.h: New file. diff --git a/rt/Makefile b/rt/Makefile index a5ce82fbca..29e7f847e4 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -44,7 +44,7 @@ librt-routines = $(aio-routines) \ tests := tst-shm tst-clock tst-clock_nanosleep tst-timer tst-timer2 \ tst-aio tst-aio64 tst-aio2 tst-aio3 tst-aio4 tst-aio5 tst-aio6 \ tst-aio7 tst-mqueue1 tst-mqueue2 tst-mqueue3 tst-mqueue4 \ - tst-mqueue5 tst-mqueue6 tst-mqueue7 tst-mqueue8 \ + tst-mqueue5 tst-mqueue6 tst-mqueue7 tst-mqueue8 tst-mqueue9 \ tst-timer3 tst-timer4 extra-libs := librt diff --git a/rt/tst-mqueue4.c b/rt/tst-mqueue4.c index fa83ece95a..aa31706f87 100644 --- a/rt/tst-mqueue4.c +++ b/rt/tst-mqueue4.c @@ -93,6 +93,18 @@ do_test (void) result = 1; } + if (mq_unlink (name) == 0) + { + puts ("mq_unlink with too long name component unexpectedly succeeded"); + result = 1; + } + else if (errno != ENAMETOOLONG) + { + printf ("mq_unlink with too long name component did not fail with " + "ENAMETOOLONG: %m\n"); + result = 1; + } + *p = '\0'; attr.mq_maxmsg = 1; attr.mq_msgsize = 3; diff --git a/rt/tst-mqueue7.c b/rt/tst-mqueue7.c index 35fd56df36..34222f8345 100644 --- a/rt/tst-mqueue7.c +++ b/rt/tst-mqueue7.c @@ -93,7 +93,7 @@ do_test (int argc, char **argv) snprintf (after_exec_arg, sizeof (after_exec_arg), "--after-exec=0x%lx", (long) q); - char *newargv[argc + 2]; + const char *newargv[argc + 2]; for (int i = 1; i < argc; ++i) newargv[i - 1] = argv[i]; newargv[argc - 1] = "--direct"; diff --git a/rt/tst-mqueue9.c b/rt/tst-mqueue9.c new file mode 100644 index 0000000000..d6ec6ca9d7 --- /dev/null +++ b/rt/tst-mqueue9.c @@ -0,0 +1,92 @@ +/* Copyright (C) 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Jakub Jelinek <jakub@redhat.com>, 2004. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <errno.h> +#include <mqueue.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include "tst-mqueue.h" + +#define TEST_FUNCTION do_test () +static int +do_test (void) +{ + if (geteuid () != 0) + { + puts ("this test requires root"); + return 0; + } + + char name[sizeof "/tst-mqueue9-" + sizeof (pid_t) * 3]; + snprintf (name, sizeof (name), "/tst-mqueue9-%u", getpid ()); + + struct mq_attr attr = { .mq_maxmsg = 1, .mq_msgsize = 1 }; + mqd_t q = mq_open (name, O_CREAT | O_EXCL | O_RDWR, 0600, &attr); + + if (q == (mqd_t) -1) + { + printf ("mq_open failed with: %m\n"); + return 0; + } + else + add_temp_mq (name); + + if (seteuid (1) != 0) + { + printf ("failed to seteuid (1): %m\n"); + mq_unlink (name); + return 0; + } + + int result; + if (mq_unlink (name) == 0) + { + puts ("mq_unlink unexpectedly succeeded"); + result = 1; + } + else if (errno != EACCES) + { + printf ("mq_unlink did not fail with EACCES: %m\n"); + result = 1;; + } + + if (seteuid (0) != 0) + { + printf ("failed to seteuid (0): %m\n"); + result = 1; + } + + if (mq_unlink (name) != 0) + { + printf ("mq_unlink failed with: %m\n"); + result = 1; + } + + if (mq_close (q) != 0) + { + printf ("mq_close failed with: %m\n"); + result = 1; + } + + return result; +} + +#include "../test-skeleton.c" diff --git a/sysdeps/unix/sysv/linux/mq_unlink.c b/sysdeps/unix/sysv/linux/mq_unlink.c index 8da70ea42b..4344c5d0ef 100644 --- a/sysdeps/unix/sysv/linux/mq_unlink.c +++ b/sysdeps/unix/sysv/linux/mq_unlink.c @@ -31,7 +31,15 @@ mq_unlink (const char *name) __set_errno (EINVAL); return -1; } - return INLINE_SYSCALL (mq_unlink, 1, name + 1); + + int ret = INLINE_SYSCALL (mq_unlink, 1, name + 1); + + /* While unlink can return either EPERM or EACCES, mq_unlink should + return just EACCES. */ + if (ret < 0 && errno == EPERM) + __set_errno (EACCES); + + return ret; } #else |