diff options
| author | Ron Yorston <rmy@pobox.com> | 2016-05-16 09:33:03 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2016-05-16 09:33:03 +0100 |
| commit | 35d2f5bccb0f3dde600702ebcdb5424d4d50be4a (patch) | |
| tree | 6e0ff0341c69839e268459a199682628bae734ed /selinux | |
| parent | 248a2600a2f4b442101ad568d1994b908bb28d4b (diff) | |
| parent | f2559e5c2b7bd2c5fa0dd8e88d0a931da92a23af (diff) | |
| download | busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.tar.gz busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.tar.bz2 busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'selinux')
| -rw-r--r-- | selinux/setfiles.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/selinux/setfiles.c b/selinux/setfiles.c index de99dfe44..51a7e63bd 100644 --- a/selinux/setfiles.c +++ b/selinux/setfiles.c | |||
| @@ -77,9 +77,10 @@ struct globals { | |||
| 77 | int nerr; | 77 | int nerr; |
| 78 | struct edir excludeArray[MAX_EXCLUDES]; | 78 | struct edir excludeArray[MAX_EXCLUDES]; |
| 79 | } FIX_ALIASING; | 79 | } FIX_ALIASING; |
| 80 | #define G (*(struct globals*)&bb_common_bufsiz1) | 80 | #define G (*(struct globals*)bb_common_bufsiz1) |
| 81 | void BUG_setfiles_globals_too_big(void); | 81 | void BUG_setfiles_globals_too_big(void); |
| 82 | #define INIT_G() do { \ | 82 | #define INIT_G() do { \ |
| 83 | setup_common_bufsiz(); \ | ||
| 83 | if (sizeof(G) > COMMON_BUFSIZE) \ | 84 | if (sizeof(G) > COMMON_BUFSIZE) \ |
| 84 | BUG_setfiles_globals_too_big(); \ | 85 | BUG_setfiles_globals_too_big(); \ |
| 85 | /* memset(&G, 0, sizeof(G)); - already is */ \ | 86 | /* memset(&G, 0, sizeof(G)); - already is */ \ |