From 37d5f80d3942af462ca7e88055388a16739a3b52 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>

Date: Tue, 20 Jun 2017 14:48:38 -0400

Subject: [PATCH 2/4] Redefine ioctl(FS_IOC_[SG]ETFLAGS) to take an int*

/usr/include/linux/fs.h: #define FS_IOC_SETFLAGS _IOW('f', 2, long)

Apparently this is known issue [1], but a fix does not seem to be

in sight. Let's fix it on our end, so that valgrind does not throw

false positives:

==31046== Syscall param ioctl(generic) points to uninitialised byte(s)

==31046==    at 0x5BB18C7: ioctl (syscall-template.S:84)

==31046==    by 0x41B791: ca_decoder_finalize_child (cadecoder.c:3656)

==31046==    by 0x41C0BE: ca_decoder_step_node (cadecoder.c:3875)

==31046==    by 0x41C9ED: ca_decoder_step (cadecoder.c:4109)

==31046==    by 0x408496: ca_sync_step_decode (casync.c:1988)

==31046==    by 0x4094F6: ca_sync_step (casync.c:2482)

==31046==    by 0x40366B: main (test-casync.c:75)

==31046==  Address 0xffefff5fc is on thread 1's stack

==31046==  in frame #1, created by ca_decoder_finalize_child (cadecoder.c:3252)

While at it, let's change the internal type from unsigned to int, since that's

what the kernel really uses.

[1] http://linux-fsdevel.vger.kernel.narkive.com/eUZdzNjw/argument-type-for-fs-ioc-getflags-fs-ioc-setflags-ioctls

---

 src/cadecoder.c     |  4 ++--

 src/cadecoder.h     |  2 +-

 src/caencoder.c     |  2 +-

 src/caencoder.h     |  2 +-

 src/caformat-util.c |  4 ++--

 src/caformat-util.h |  2 +-

 src/casync-tool.c   |  4 ++--

 src/casync.c        |  2 +-

 src/casync.h        |  2 +-

 src/util.c          |  6 +++---

 src/util.h          | 11 ++++++++++-

 11 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/cadecoder.c b/src/cadecoder.c

index 6a59e02968..deba462a47 100644

--- a/src/cadecoder.c

+++ b/src/cadecoder.c

@@ -3642,7 +3642,7 @@ static int ca_decoder_finalize_child(CaDecoder *d, CaDecoderNode *n, CaDecoderNo

         }

         if ((d->feature_flags & CA_FORMAT_WITH_CHATTR) != 0 && child->fd >= 0) {

-                unsigned new_attr, old_attr;

+                int new_attr, old_attr;

                 new_attr = ca_feature_flags_to_chattr(read_le64(&child->entry->flags) & d->feature_flags);

@@ -4471,7 +4471,7 @@ int ca_decoder_current_rdev(CaDecoder *d, dev_t *ret) {

         return 0;

 }

-int ca_decoder_current_chattr(CaDecoder *d, unsigned *ret) {

+int ca_decoder_current_chattr(CaDecoder *d, int *ret) {

         CaDecoderNode *n;

         mode_t mode;

diff --git a/src/cadecoder.h b/src/cadecoder.h

index d658676c88..48f81e7c1a 100644

--- a/src/cadecoder.h

+++ b/src/cadecoder.h

@@ -89,7 +89,7 @@ int ca_decoder_current_user(CaDecoder *d, const char **user);

 int ca_decoder_current_group(CaDecoder *d, const char **user);

 int ca_decoder_current_rdev(CaDecoder *d, dev_t *ret);

 int ca_decoder_current_offset(CaDecoder *d, uint64_t *ret);

-int ca_decoder_current_chattr(CaDecoder *d, unsigned *ret);

+int ca_decoder_current_chattr(CaDecoder *d, int *ret);

 int ca_decoder_current_fat_attrs(CaDecoder *d, uint32_t *ret);

 int ca_decoder_current_xattr(CaDecoder *d, CaIterate where, const char **ret_name, const void **ret_value, size_t *ret_size);

diff --git a/src/caencoder.c b/src/caencoder.c

index 4bea8adae9..bcae40b289 100644

--- a/src/caencoder.c

+++ b/src/caencoder.c

@@ -2850,7 +2850,7 @@ int ca_encoder_current_rdev(CaEncoder *e, dev_t *ret) {

         return 0;

 }

-int ca_encoder_current_chattr(CaEncoder *e, unsigned *ret) {

+int ca_encoder_current_chattr(CaEncoder *e, int *ret) {

         CaEncoderNode *n;

         if (!e)

diff --git a/src/caencoder.h b/src/caencoder.h

index 26388261bd..e270cc0b1a 100644

--- a/src/caencoder.h

+++ b/src/caencoder.h

@@ -49,7 +49,7 @@ int ca_encoder_current_gid(CaEncoder *e, gid_t *ret);

 int ca_encoder_current_user(CaEncoder *e, const char **ret);

 int ca_encoder_current_group(CaEncoder *e, const char **ret);

 int ca_encoder_current_rdev(CaEncoder *e, dev_t *ret);

-int ca_encoder_current_chattr(CaEncoder *e, unsigned *ret);

+int ca_encoder_current_chattr(CaEncoder *e, int *ret);

 int ca_encoder_current_fat_attrs(CaEncoder *e, uint32_t *ret);

 int ca_encoder_current_xattr(CaEncoder *e, CaIterate where, const char **ret_name, const void **ret_value, size_t *ret_size);

diff --git a/src/caformat-util.c b/src/caformat-util.c

index 332c6793a9..0b7512f353 100644

--- a/src/caformat-util.c

+++ b/src/caformat-util.c

@@ -279,8 +279,8 @@ uint64_t ca_feature_flags_from_chattr(unsigned flags) {

         return f;

 }

-unsigned ca_feature_flags_to_chattr(uint64_t flags) {

-        unsigned f = 0;

+int ca_feature_flags_to_chattr(uint64_t flags) {

+        int f = 0;

         size_t i;

         for (i = 0; i < ELEMENTSOF(chattr_map); i++)

diff --git a/src/caformat-util.h b/src/caformat-util.h

index 68741203fe..2e5db2bd19 100644

--- a/src/caformat-util.h

+++ b/src/caformat-util.h

@@ -14,7 +14,7 @@ int ca_feature_flags_normalize(uint64_t flags, uint64_t *ret);

 int ca_feature_flags_time_granularity_nsec(uint64_t flags, uint64_t *ret);

 uint64_t ca_feature_flags_from_chattr(unsigned flags);

-unsigned ca_feature_flags_to_chattr(uint64_t flags);

+int ca_feature_flags_to_chattr(uint64_t flags);

 uint64_t ca_feature_flags_from_fat_attrs(uint32_t flags);

 uint32_t ca_feature_flags_to_fat_attrs(uint64_t flags);

diff --git a/src/casync-tool.c b/src/casync-tool.c

index 1650028a1a..97e33d5b5b 100644

--- a/src/casync-tool.c

+++ b/src/casync-tool.c

@@ -2058,7 +2058,7 @@ static int verb_list(int argc, char *argv[]) {

                                 uid_t uid = UID_INVALID;

                                 gid_t gid = GID_INVALID;

                                 dev_t rdev = (dev_t) -1;

-                                unsigned flags = (unsigned) -1;

+                                int flags = -1;

                                 uint32_t fat_attrs = (uint32_t) -1;

                                 char *escaped = NULL;

                                 const char *xname;

@@ -2093,7 +2093,7 @@ static int verb_list(int argc, char *argv[]) {

                                 escaped = mfree(escaped);

-                                if (flags != (unsigned) -1)

+                                if (flags != -1)

                                         printf("FileAttr: %s\n", strna(ls_format_chattr(flags, ls_flags)));

                                 if (fat_attrs != (uint32_t) -1)

diff --git a/src/casync.c b/src/casync.c

index ceac46dc7b..c73d9396ca 100644

--- a/src/casync.c

+++ b/src/casync.c

@@ -2943,7 +2943,7 @@ int ca_sync_current_rdev(CaSync *s, dev_t *ret) {

         return -ENOTTY;

 }

-int ca_sync_current_chattr(CaSync *s, unsigned *ret) {

+int ca_sync_current_chattr(CaSync *s, int *ret) {

         CaSeed *seed;

         if (!s)

diff --git a/src/casync.h b/src/casync.h

index 62818d13e3..afab401e01 100644

--- a/src/casync.h

+++ b/src/casync.h

@@ -96,7 +96,7 @@ int ca_sync_current_group(CaSync *sync, const char **ret);

 int ca_sync_current_mtime(CaSync *sync, uint64_t *nsec);

 int ca_sync_current_size(CaSync *sync, uint64_t *ret);

 int ca_sync_current_rdev(CaSync *sync, dev_t *ret);

-int ca_sync_current_chattr(CaSync *sync, unsigned *ret);

+int ca_sync_current_chattr(CaSync *sync, int *ret);

 int ca_sync_current_fat_attrs(CaSync *sync, uint32_t *ret);

 int ca_sync_current_xattr(CaSync *sync, CaIterate where, const char **ret_name, const void **ret_value, size_t *ret_size);

diff --git a/src/util.c b/src/util.c

index b0f3138254..67e480a379 100644

--- a/src/util.c

+++ b/src/util.c

@@ -672,10 +672,10 @@ char* ls_format_mode(mode_t m, char ret[LS_FORMAT_MODE_MAX]) {

         return ret;

 }

-char *ls_format_chattr(unsigned flags, char ret[LS_FORMAT_CHATTR_MAX]) {

+char *ls_format_chattr(int flags, char ret[LS_FORMAT_CHATTR_MAX]) {

         static const struct {

-                unsigned flag;

+                int flag;

                 char code;

         } table[] = {

                 { FS_SYNC_FL,        'S' },

@@ -692,7 +692,7 @@ char *ls_format_chattr(unsigned flags, char ret[LS_FORMAT_CHATTR_MAX]) {

         size_t i;

-        if (flags == (unsigned) -1)

+        if (flags == -1)

                 return NULL;

         assert(ELEMENTSOF(table) == LS_FORMAT_CHATTR_MAX-1);

diff --git a/src/util.h b/src/util.h

index 2d82cc2c4e..16891ec80c 100644

--- a/src/util.h

+++ b/src/util.h

@@ -46,6 +46,15 @@

                 UNIQ_T(A,aq) < UNIQ_T(B,bq) ? UNIQ_T(A,aq) : UNIQ_T(B,bq); \

         })

+

+/* "linux/fs.h" contains wrong definitions of FS_IOC_[GS]ETFLAGS.

+ * This problem has been known for at least 14 years. To avoid a spurious

+ * warning from valgrind, let's override the kernel definitions. */

+#undef FS_IOC_GETFLAGS

+#undef FS_IOC_SETFLAGS

+#define FS_IOC_GETFLAGS                 _IOR('f', 1, int)

+#define FS_IOC_SETFLAGS                 _IOW('f', 2, int)

+

 static inline uint64_t timespec_to_nsec(struct timespec t) {

         if (t.tv_sec == (time_t) -1 &&

@@ -285,7 +294,7 @@ char *strjoin_real(const char *x, ...) _sentinel_;

 char* ls_format_mode(mode_t m, char ret[LS_FORMAT_MODE_MAX]);

 #define LS_FORMAT_CHATTR_MAX 11

-char *ls_format_chattr(unsigned flags, char ret[LS_FORMAT_CHATTR_MAX]);

+char *ls_format_chattr(int flags, char ret[LS_FORMAT_CHATTR_MAX]);

 #define LS_FORMAT_FAT_ATTRS_MAX 4

 char *ls_format_fat_attrs(unsigned flags, char ret[LS_FORMAT_FAT_ATTRS_MAX]);

-- 

2.13.0