diff options
Diffstat (limited to 'rt')
| -rw-r--r-- | rt/Makefile | 4 | ||||
| -rw-r--r-- | rt/Versions | 3 | ||||
| -rw-r--r-- | rt/bits/mqueue2.h | 56 | ||||
| -rw-r--r-- | rt/mq_open.c | 16 | ||||
| -rw-r--r-- | rt/mqueue.h | 6 |
5 files changed, 81 insertions, 4 deletions
diff --git a/rt/Makefile b/rt/Makefile index 148ded996e..fe25309098 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc. +# Copyright (C) 1997-2004, 2006, 2007 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ # subdir := rt -headers := aio.h mqueue.h bits/mqueue.h +headers := aio.h mqueue.h bits/mqueue.h bits/mqueue2.h aio-routines := aio_cancel aio_error aio_fsync aio_misc aio_read \ aio_read64 aio_return aio_suspend aio_write \ diff --git a/rt/Versions b/rt/Versions index 51bb033ec9..2921c9c8ab 100644 --- a/rt/Versions +++ b/rt/Versions @@ -22,4 +22,7 @@ librt { mq_open; mq_close; mq_unlink; mq_getattr; mq_setattr; mq_notify; mq_send; mq_receive; mq_timedsend; mq_timedreceive; } + GLIBC_2.7 { + __mq_open_2; + } } diff --git a/rt/bits/mqueue2.h b/rt/bits/mqueue2.h new file mode 100644 index 0000000000..4c90609e83 --- /dev/null +++ b/rt/bits/mqueue2.h @@ -0,0 +1,56 @@ +/* Checking macros for mq functions. + Copyright (C) 2007 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + 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. */ + +#ifndef _FCNTL_H +# error "Never include <bits/mqueue2.h> directly; use <mqueue.h> instead." +#endif + +/* Check that calls to mq_open with O_CREAT set have an appropriate third and fourth + parameter. */ +extern mqd_t mq_open (__const char *__name, int __oflag, ...) + __THROW __nonnull ((1)); +extern mqd_t __mq_open_2 (__const char *__name, int __oflag) __nonnull ((1)); +extern mqd_t __REDIRECT (__mq_open_alias, (__const char *__name, int __oflag, ...), + mq_open) __nonnull ((1)); +__errordecl (__mq_open_wrong_number_of_args, + "mq_open can be called either with 2 or 4 arguments"); +__errordecl (__mq_open_missing_mode_and_attr, + "mq_open with O_CREAT in second argument needs 4 arguments"); + +__extern_always_inline mqd_t +mq_open (__const char *__name, int __oflag, ...) +{ + if (__va_arg_pack_len () != 0 && __va_arg_pack_len () != 2) + __mq_open_wrong_number_of_args (); + + if (__builtin_constant_p (__oflag)) + { + if ((__oflag & O_CREAT) != 0 && __va_arg_pack_len () == 0) + { + __mq_open_missing_mode_and_attr (); + return __mq_open_2 (__name, __oflag); + } + return __mq_open_alias (__name, __oflag, __va_arg_pack ()); + } + + if (__va_arg_pack_len () == 0) + return __mq_open_2 (__name, __oflag); + + return __mq_open_alias (__name, __oflag, __va_arg_pack ()); +} diff --git a/rt/mq_open.c b/rt/mq_open.c index dea5741d5a..77d872ea20 100644 --- a/rt/mq_open.c +++ b/rt/mq_open.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2004 Free Software Foundation, Inc. +/* Copyright (C) 2004, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -18,6 +18,7 @@ #include <errno.h> #include <mqueue.h> +#include <stdio.h> /* Establish connection between a process and a message queue NAME and return message queue descriptor or (mqd_t) -1 on error. OFLAG determines @@ -27,10 +28,21 @@ attributes. If the fourth argument is NULL, default attributes are used. */ mqd_t -mq_open (const char *name, int oflag, ...) +__mq_open (const char *name, int oflag, ...) { __set_errno (ENOSYS); return (mqd_t) -1; } +strong_alias (__mq_open, mq_open); stub_warning (mq_open) + +mqd_t +__mq_open_2 (const char *name, int oflag) +{ + if (oflag & O_CREAT) + __fortify_fail ("invalid mq_open call: O_CREAT without mode and attr"); + + return __mq_open (name, oflag); +} +stub_warning (__mq_open_2) #include <stub-tag.h> diff --git a/rt/mqueue.h b/rt/mqueue.h index b811330332..a4c3e1b2fa 100644 --- a/rt/mqueue.h +++ b/rt/mqueue.h @@ -90,6 +90,12 @@ extern int mq_timedsend (mqd_t __mqdes, __const char *__msg_ptr, __nonnull ((2, 5)); #endif +/* Define some inlines helping to catch common problems. */ +#if __USE_FORTIFY_LEVEL > 0 && defined __extern_always_inline \ + && defined __va_arg_pack_len +# include <bits/mqueue2.h> +#endif + __END_DECLS #endif /* mqueue.h */ |