AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 20:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

debug: Fix clang mq_open fortify wrapper (BZ 31917)

Browse Source 
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>
This commit is contained in:
Adhemerval Zanella 2024-06-21 11:08:38 -03:00
parent c0f21e073d
commit c5579f3a71
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rt/bits/mqueue2.h
View File

@ -59,13 +59,16 @@ __NTH (mq_open (const char *__name, int __oflag, ...))
} }
#elif __fortify_use_clang #elif __fortify_use_clang
__fortify_function_error_function __attribute_overloadable__ mqd_t __fortify_function_error_function __attribute_overloadable__ mqd_t
__NTH (mq_open (const char *__name, int __oflag, mode_t mode)) __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_clang_unavailable ("mq_open can be called either with 2 or 4 arguments");
__fortify_function_error_function __attribute_overloadable__ mqd_t __fortify_function __attribute_overloadable__ mqd_t
__NTH (mq_open (const char *__name, int __oflag, mode_t mode, __NTH (mq_open (__fortify_clang_overload_arg (const char *, ,__name),
struct mq_attr *attr, ...)) int __oflag, mode_t __mode, struct mq_attr *__attr))
__fortify_clang_unavailable ("mq_open can be called either with 2 or 4 arguments"); {
return __mq_open_alias (__name, __oflag, __mode, __attr);
}
__fortify_function __attribute_overloadable__ mqd_t __fortify_function __attribute_overloadable__ mqd_t
__NTH (mq_open (__fortify_clang_overload_arg (const char *, ,__name), __NTH (mq_open (__fortify_clang_overload_arg (const char *, ,__name),
@ -76,11 +79,4 @@ __NTH (mq_open (__fortify_clang_overload_arg (const char *, ,__name),
{ {
return __mq_open_alias (__name, __oflag); return __mq_open_alias (__name, __oflag);
} }
__fortify_function __attribute_overloadable__ mqd_t
__NTH (mq_open (__fortify_clang_overload_arg (const char *, ,__name),
int __oflag, int __mode, struct mq_attr *__attr))
{
return __mq_open_alias (__name, __oflag, __mode, __attr);
}
#endif #endif