system/pipewire
system/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire synced 2024-09-28 20:23:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

pipewire-v4l2: move open*() flag check into function

Browse source 
This commit moves the check that determines whether the mode
argument of `open*()` exists into a separate function.

With that, the check is fixed because previously it failed to
account for the fact that `O_TMPFILE` is not a power of two.

Furthermore, add `assert()`s in the fortified variants that
ensure that no mode is required by the specified flags.
This commit is contained in:
Barnabás Pőcze 2024-06-18 02:58:59 +02:00
parent 9d1d1fcbef
commit 7674b15fab
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pipewire-v4l2/src/v4l2-func.c
View file

@ -11,8 +11,9 @@
#undef _FORTIFY_SOURCE
#endif
#include <assert.h>
#include <stdbool.h>
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
#include <stdarg.h>
#include <sys/mman.h>
@ -31,10 +32,15 @@
va_end(ap); \
}
static inline bool needs_mode(int flags)
{
return (flags & O_CREAT) || ((flags & O_TMPFILE) == O_TMPFILE);
}
SPA_EXPORT int open(const char *path, int oflag, ...)
{
mode_t mode = 0;
if (oflag & O_CREAT || oflag & O_TMPFILE)
if (needs_mode(oflag))
extract_va_arg(mode_t, mode, oflag);
return get_fops()->openat(AT_FDCWD, path, oflag, mode);
@ -43,6 +49,7 @@ SPA_EXPORT int open(const char *path, int oflag, ...)
/* _FORTIFY_SOURCE redirects open to __open_2 */
SPA_EXPORT int __open_2(const char *path, int oflag)
{
assert(!needs_mode(oflag));
return open(path, oflag);
}
@ -50,7 +57,7 @@ SPA_EXPORT int __open_2(const char *path, int oflag)
SPA_EXPORT int open64(const char *path, int oflag, ...)
{
mode_t mode = 0;
if (oflag & O_CREAT || oflag & O_TMPFILE)
if (needs_mode(oflag))
extract_va_arg(mode_t, mode, oflag);
return get_fops()->openat(AT_FDCWD, path, oflag | O_LARGEFILE, mode);
@ -58,14 +65,15 @@ SPA_EXPORT int open64(const char *path, int oflag, ...)
SPA_EXPORT int __open64_2(const char *path, int oflag)
{
return open64(path, oflag);
assert(!needs_mode(oflag));
return open64(path, oflag);
}
#endif
SPA_EXPORT int openat(int dirfd, const char *path, int oflag, ...)
{
mode_t mode = 0;
if (oflag & O_CREAT || oflag & O_TMPFILE)
if (needs_mode(oflag))
extract_va_arg(mode_t, mode, oflag);
return get_fops()->openat(dirfd, path, oflag, mode);
@ -73,6 +81,7 @@ SPA_EXPORT int openat(int dirfd, const char *path, int oflag, ...)
SPA_EXPORT int __openat_2(int dirfd, const char *path, int oflag)
{
assert(!needs_mode(oflag));
return openat(dirfd, path, oflag);
}
@ -80,7 +89,7 @@ SPA_EXPORT int __openat_2(int dirfd, const char *path, int oflag)
SPA_EXPORT int openat64(int dirfd, const char *path, int oflag, ...)
{
mode_t mode = 0;
if (oflag & O_CREAT || oflag & O_TMPFILE)
if (needs_mode(oflag))
extract_va_arg(mode_t, mode, oflag);
return get_fops()->openat(dirfd, path, oflag | O_LARGEFILE, mode);
@ -88,6 +97,7 @@ SPA_EXPORT int openat64(int dirfd, const char *path, int oflag, ...)
SPA_EXPORT int __openat64_2(int dirfd, const char *path, int oflag)
{
assert(!needs_mode(oflag));
return openat64(dirfd, path, oflag);
}
#endif