picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

util: fix strict aliasing violations in use of struct inotify_event v5 

There is alot of cleanup that will have to happen to turn on
-fstrict-aliasing, but I think our code should be "correct" to the rule.
This commit is contained in:
Shawn Paul Landden 2014-12-23 13:47:16 -08:00 committed by Lennart Poettering
parent 60329a9d9f
commit 0254e9448f
6 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/mount.c
View File

@ -1701,11 +1701,11 @@ static int mount_dispatch_io(sd_event_source *source, int fd, uint32_t revents,
* internal behaviour of libmount here. */
for (;;) {
uint8_t buffer[INOTIFY_EVENT_MAX] _alignas_(struct inotify_event);
union inotify_event_buffer buffer;
struct inotify_event *e;
ssize_t l;
l = read(fd, buffer, sizeof(buffer));
l = read(fd, &buffer, sizeof(buffer));
if (l < 0) {
if (errno == EAGAIN || errno == EINTR)
break;

4
src/core/path.c
View File

@ -157,7 +157,7 @@ void path_spec_unwatch(PathSpec *s) {
}
int path_spec_fd_event(PathSpec *s, uint32_t revents) {
uint8_t buffer[INOTIFY_EVENT_MAX] _alignas_(struct inotify_event);
union inotify_event_buffer buffer;
struct inotify_event *e;
ssize_t l;
int r = 0;
@ -167,7 +167,7 @@ int path_spec_fd_event(PathSpec *s, uint32_t revents) {
return -EINVAL;
}
l = read(s->inotify_fd, buffer, sizeof(buffer));
l = read(s->inotify_fd, &buffer, sizeof(buffer));
if (l < 0) {
if (errno == EAGAIN || errno == EINTR)
return 0;

4
src/journal/sd-journal.c
View File

@ -2188,11 +2188,11 @@ _public_ int sd_journal_process(sd_journal *j) {
j->last_process_usec = now(CLOCK_MONOTONIC);
for (;;) {
uint8_t buffer[INOTIFY_EVENT_MAX] _alignas_(struct inotify_event);
union inotify_event_buffer buffer;
struct inotify_event *e;
ssize_t l;
l = read(j->inotify_fd, buffer, sizeof(buffer));
l = read(j->inotify_fd, &buffer, sizeof(buffer));
if (l < 0) {
if (errno == EAGAIN || errno == EINTR)
return got_something ? determine_change(j) : SD_JOURNAL_NOP;

5
src/shared/util.c
View File

@ -39,7 +39,6 @@
#include <linux/tiocl.h>
#include <termios.h>
#include <stdarg.h>
#include <sys/inotify.h>
#include <sys/poll.h>
#include <ctype.h>
#include <sys/prctl.h>
@ -2106,7 +2105,7 @@ int acquire_terminal(
assert(notify >= 0);
for (;;) {
uint8_t buffer[INOTIFY_EVENT_MAX] _alignas_(struct inotify_event);
union inotify_event_buffer buffer;
struct inotify_event *e;
ssize_t l;
@ -2129,7 +2128,7 @@ int acquire_terminal(
}
}
l = read(notify, buffer, sizeof(buffer));
l = read(notify, &buffer, sizeof(buffer));
if (l < 0) {
if (errno == EINTR || errno == EAGAIN)
continue;

10
src/shared/util.h
View File

@ -42,6 +42,7 @@
#include <locale.h>
#include <mntent.h>
#include <sys/socket.h>
#include <sys/inotify.h>
#if SIZEOF_PID_T == 4
# define PID_FMT "%" PRIu32
@ -1047,10 +1048,15 @@ int sethostname_idempotent(const char *s);
#define INOTIFY_EVENT_MAX (sizeof(struct inotify_event) + NAME_MAX + 1)
#define FOREACH_INOTIFY_EVENT(e, buffer, sz) \
for ((e) = (struct inotify_event*) (buffer); \
(uint8_t*) (e) < (uint8_t*) (buffer) + (sz); \
for ((e) = &buffer.ev; \
(uint8_t*) (e) < (uint8_t*) (buffer.raw) + (sz); \
(e) = (struct inotify_event*) ((uint8_t*) (e) + sizeof(struct inotify_event) + (e)->len))
union inotify_event_buffer {
struct inotify_event ev;
uint8_t raw[INOTIFY_EVENT_MAX];
};
#define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), AT_SYMLINK_NOFOLLOW)
int ptsname_malloc(int fd, char **ret);

4
src/udev/udevd.c
View File

@ -816,11 +816,11 @@ static int synthesize_change(struct udev_device *dev) {
}
static int handle_inotify(struct udev *udev) {
uint8_t buffer[INOTIFY_EVENT_MAX] _alignas_(struct inotify_event);
union inotify_event_buffer buffer;
struct inotify_event *e;
ssize_t l;
l = read(fd_inotify, buffer, sizeof(buffer));
l = read(fd_inotify, &buffer, sizeof(buffer));
if (l < 0) {
if (errno == EAGAIN || errno == EINTR)
return 0;