mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
c5579f3a71
The mqueue.h fortify wrapper for clang added by c23107effb
is not fully correct, where correct 4 argument usage are not
being correctly handled. For instance, while building socat 1.8
with a yocto clang based system shows:
./socat-1.8.0.0/xio-posixmq.c:119:8: error: 'mq_open' is unavailable: mq_open can be called either with 2 or 4 arguments
119 | mqd = mq_open(name, oflag, opt_mode, NULL);
| ^
[...] /usr/include/bits/mqueue2.h:66:8: note: 'mq_open' has been explicitly marked unavailable here
66 | __NTH (mq_open (const char *__name, int __oflag, mode_t mode,
| ^
1 error generated.
The correct way to define the wrapper is to set invalid usage
with __fortify_clang_unavailable (for the case with 5 or more
arguments), followed by the expected ones. This fix make mq_open
similar to current open wrappers.
[1] http://www.dest-unreach.org/socat/
Reported-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
83 lines
3.0 KiB
C
83 lines
3.0 KiB
C
/* Checking macros for mq functions.
|
|
Copyright (C) 2007-2024 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, see
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#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)
|
|
__THROW __nonnull ((1));
|
|
extern mqd_t __REDIRECT_NTH (__mq_open_alias, (const char *__name,
|
|
int __oflag, ...), mq_open)
|
|
__nonnull ((1));
|
|
|
|
#ifdef __va_arg_pack_len
|
|
__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");
|
|
|
|
__fortify_function mqd_t
|
|
__NTH (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 ());
|
|
}
|
|
#elif __fortify_use_clang
|
|
__fortify_function_error_function __attribute_overloadable__ mqd_t
|
|
__NTH (mq_open (__fortify_clang_overload_arg (const char *, , __name),
|
|
int __oflag, mode_t __mode, ...))
|
|
__fortify_clang_unavailable ("mq_open can be called either with 2 or 4 arguments");
|
|
|
|
__fortify_function __attribute_overloadable__ mqd_t
|
|
__NTH (mq_open (__fortify_clang_overload_arg (const char *, ,__name),
|
|
int __oflag, mode_t __mode, struct mq_attr *__attr))
|
|
{
|
|
return __mq_open_alias (__name, __oflag, __mode, __attr);
|
|
}
|
|
|
|
__fortify_function __attribute_overloadable__ mqd_t
|
|
__NTH (mq_open (__fortify_clang_overload_arg (const char *, ,__name),
|
|
int __oflag))
|
|
__fortify_clang_prefer_this_overload
|
|
__fortify_clang_error ((__oflag & O_CREAT),
|
|
"mq_open with O_CREAT in second argument needs 4 arguments")
|
|
{
|
|
return __mq_open_alias (__name, __oflag);
|
|
}
|
|
#endif
|