[PATCH 0/6] fix various minor issues and warnings

[PATCH 0/6] fix various minor issues and warnings

[Ruediger Meier]

From: Ruediger Meier <ruediger.meier@ga-group.nl>

Ruediger Meier (6):
  tests: fix fincore, don't use variable COLUMNS
  libmount: btrfs, remove unused setter functions
  hwclock: fix warning [-Winvalid-noreturn]
  misc: fix gcc-7 sprintf warnings -Wformat-overflow
  misc: fix gcc-7 snprintf warnings -Wformat-truncation
  libblkid: fix gcc-7 warning -Wint-in-bool-context

 lib/loopdev.c                    |  2 +-
 lib/sysfs.c                      |  4 ++--
 libblkid/src/devname.c           |  2 +-
 libblkid/src/superblocks/exfat.c |  4 ++--
 libmount/src/btrfs.c             |  4 ----
 login-utils/last.c               |  2 +-
 sys-utils/hwclock.c              |  2 +-
 sys-utils/hwclock.h              |  3 ++-
 tests/ts/fincore/count           | 12 ++++++------
 9 files changed, 16 insertions(+), 19 deletions(-)

-- 
2.12.3

[PATCH 1/6] tests: fix fincore, don't use variable COLUMNS

[Ruediger Meier]

From: Ruediger Meier <ruediger.meier@ga-group.nl>

COLUMNS is automatically set by bash and may result in stupid
errors like

  fincore: unknown column: 160

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
 tests/ts/fincore/count | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/ts/fincore/count b/tests/ts/fincore/count
index 7a1c5d426..0151016ee 100755
--- a/tests/ts/fincore/count
+++ b/tests/ts/fincore/count
@@ -70,7 +70,7 @@ function run_dd_test
 		_dd if=/dev/zero of=$input count=1 bs=$bs $flags || return
     fi
 
-    $TS_CMD_FINCORE --output $COLUMNS  --bytes --noheadings $input
+    $TS_CMD_FINCORE --output $OUT_COLUMNS  --bytes --noheadings $input
 
     footer "$?"
 }
@@ -90,7 +90,7 @@ function run_dd_dd_test
     _dd if=/dev/zero of=$input count=1 bs=$bs $flags0 || return
     _dd if=/dev/zero of=$input count=1 bs=$bs $flags1 || return
 
-    $TS_CMD_FINCORE --output $COLUMNS --bytes --noheadings $input
+    $TS_CMD_FINCORE --output $OUT_COLUMNS --bytes --noheadings $input
 
     footer "$?"
 }
@@ -102,10 +102,10 @@ WINDOW_SIZE=$(( 32 * 1024 * PAGE_SIZE ))
 # we use PAGE_SIZE dependent output for a few systems
 if test -f "$TS_EXPECTED.$PAGE_SIZE"; then
 	TS_EXPECTED+=".$PAGE_SIZE"
-	COLUMNS="PAGES,SIZE,FILE"
+	OUT_COLUMNS="PAGES,SIZE,FILE"
 else
 	TS_EXPECTED+=".nosize"
-	COLUMNS="PAGES,FILE"
+	OUT_COLUMNS="PAGES,FILE"
 fi
 
 
@@ -122,7 +122,7 @@ input=
     INPUT="${INPUT} ${input}"
 
     header "NO EXCITING FILE"
-    $TS_CMD_FINCORE --output $COLUMNS --bytes --noheadings $input
+    $TS_CMD_FINCORE --output $OUT_COLUMNS --bytes --noheadings $input
     footer "$?"
 } >> $TS_OUTPUT 2>&1
 
@@ -220,7 +220,7 @@ input=
 
 {
     header "MULTIPLE FILES"
-    $TS_CMD_FINCORE --output $COLUMNS --bytes $INPUT
+    $TS_CMD_FINCORE --output $OUT_COLUMNS --bytes $INPUT
     footer "$?"
 } >> $TS_OUTPUT 2>&1
 
-- 
2.12.3

[PATCH 2/6] libmount: btrfs, remove unused setter functions

[Ruediger Meier]

From: Ruediger Meier <ruediger.meier@ga-group.nl>

We have never used them since introduced in 2cd28fc8.
clang compiler warned about it.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
 libmount/src/btrfs.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libmount/src/btrfs.c b/libmount/src/btrfs.c
index be4d144bf..c387fadd5 100644
--- a/libmount/src/btrfs.c
+++ b/libmount/src/btrfs.c
@@ -67,10 +67,6 @@ struct btrfs_dir_item {
 static inline uint##bits##_t btrfs_##name(const type *s)		\
 {									\
 	return le##bits##_to_cpu(s->member);				\
-}									\
-static inline void btrfs_set_##name(type *s, uint##bits##_t val)	\
-{									\
-	s->member = cpu_to_le##bits(val);				\
 }
 
 /* struct btrfs_disk_key */
-- 
2.12.3

[PATCH 3/6] hwclock: fix warning [-Winvalid-noreturn]

[Ruediger Meier]

From: Ruediger Meier <ruediger.meier@ga-group.nl>

clang warned:

 CC       sys-utils/hwclock.o
../sys-utils/hwclock.c:1274:1: warning: function declared 'noreturn' should not return [-Winvalid-noreturn]

We have to move the noreturn attribute from the function definition
to the declaration.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
 sys-utils/hwclock.c | 2 +-
 sys-utils/hwclock.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index 603146079..cfb6bcd6b 100644
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -1535,7 +1535,7 @@ int main(int argc, char **argv)
 	return rc;		/* Not reached */
 }
 
-void __attribute__((__noreturn__))
+void
 hwclock_exit(const struct hwclock_control *ctl
 #ifndef HAVE_LIBAUDIT
 	     __attribute__((__unused__))
diff --git a/sys-utils/hwclock.h b/sys-utils/hwclock.h
index f3f76a6da..d527fe310 100644
--- a/sys-utils/hwclock.h
+++ b/sys-utils/hwclock.h
@@ -73,6 +73,7 @@ extern int get_epoch_rtc(const struct hwclock_control *ctl, unsigned long *epoch
 extern int set_epoch_rtc(const struct hwclock_control *ctl);
 #endif
 
-extern void hwclock_exit(const struct hwclock_control *ctl, int status);
+extern void __attribute__((__noreturn__))
+hwclock_exit(const struct hwclock_control *ctl, int status);
 
 #endif				/* HWCLOCK_CLOCK_H */
-- 
2.12.3

[PATCH 4/6] misc: fix gcc-7 sprintf warnings -Wformat-overflow

[Ruediger Meier]

From: Ruediger Meier <ruediger.meier@ga-group.nl>

../login-utils/last.c: In function ‘main’:
../login-utils/last.c:624:23: warning: ‘%s’ directive writing up to 31 bytes into a region of size 27 [-Wformat-overflow=]
   sprintf(path, "/dev/%s", ut->ut_line);
                       ^~   ~~
../login-utils/last.c:624:3: note: ‘sprintf’ output between 6 and 37 bytes into a destination of size 32
   sprintf(path, "/dev/%s", ut->ut_line);

../libblkid/src/devname.c: In function 'probe_one':
../libblkid/src/devname.c:166:29: warning: '%s' directive writing up to 255 bytes into a region of size 245 [-Wformat-overflow=]
   sprintf(path, "/sys/block/%s/slaves", de->d_name);
                             ^~
../libblkid/src/devname.c:166:3: note: 'sprintf' output between 19 and 274 bytes into a destination of size 256
   sprintf(path, "/sys/block/%s/slaves", de->d_name);
   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
 libblkid/src/devname.c | 2 +-
 login-utils/last.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libblkid/src/devname.c b/libblkid/src/devname.c
index ba3c57a41..59029ec06 100644
--- a/libblkid/src/devname.c
+++ b/libblkid/src/devname.c
@@ -152,7 +152,7 @@ static int is_dm_leaf(const char *devname)
 {
 	struct dirent	*de, *d_de;
 	DIR		*dir, *d_dir;
-	char		path[256];
+	char		path[NAME_MAX + 18 + 1];
 	int		ret = 1;
 
 	if ((dir = opendir("/sys/block")) == NULL)
diff --git a/login-utils/last.c b/login-utils/last.c
index f93ec7fbf..c90b574e5 100644
--- a/login-utils/last.c
+++ b/login-utils/last.c
@@ -598,7 +598,7 @@ static void __attribute__((__noreturn__)) usage(const struct last_control *ctl,
 static int is_phantom(const struct last_control *ctl, struct utmpx *ut)
 {
 	struct passwd *pw;
-	char path[32];
+	char path[sizeof(ut->ut_line) + 16];
 	int ret = 0;
 
 	if (ut->ut_tv.tv_sec < ctl->boot_time.tv_sec)
-- 
2.12.3

[PATCH 5/6] misc: fix gcc-7 snprintf warnings -Wformat-truncation

[Ruediger Meier]

From: Ruediger Meier <ruediger.meier@ga-group.nl>

../lib/loopdev.c: In function 'loopcxt_next_from_sysfs':
../lib/loopdev.c:545:32: warning: '/loop/backing_file' directive output may be truncated writing 18 bytes into a region of size between 1 and 256 [-Wformat-truncation=]
   snprintf(name, sizeof(name), "%s/loop/backing_file", d->d_name);
                                ^~~~~~~~~~~~~~~~~~~~~~
../lib/loopdev.c:545:3: note: 'snprintf' output between 19 and 274 bytes into a destination of size 256
   snprintf(name, sizeof(name), "%s/loop/backing_file", d->d_name);
   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

../lib/sysfs.c: In function 'sysfs_is_partition_dirent':
../lib/sysfs.c:343:31: warning: '/start' directive output may be truncated writing 6 bytes into a region of size between 1 and 256 [-Wformat-truncation=]
  snprintf(path, sizeof(path), "%s/start", d->d_name);
                               ^~~~~~~~~~
../lib/sysfs.c:343:2: note: 'snprintf' output between 7 and 262 bytes into a destination of size 256
  snprintf(path, sizeof(path), "%s/start", d->d_name);
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../lib/sysfs.c: In function 'sysfs_partno_to_devno':
../lib/sysfs.c:372:32: warning: '/partition' directive output may be truncated writing 10 bytes into a region of size between 1 and 256 [-Wformat-truncation=]
   snprintf(path, sizeof(path), "%s/partition", d->d_name);
                                ^~~~~~~~~~~~~~
../lib/sysfs.c:372:3: note: 'snprintf' output between 11 and 266 bytes into a destination of size 256
   snprintf(path, sizeof(path), "%s/partition", d->d_name);
   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../lib/sysfs.c:377:33: warning: '/dev' directive output may be truncated writing 4 bytes into a region of size between 1 and 256 [-Wformat-truncation=]
    snprintf(path, sizeof(path), "%s/dev", d->d_name);
                                 ^~~~~~~~
../lib/sysfs.c:377:4: note: 'snprintf' output between 5 and 260 bytes into a destination of size 256
    snprintf(path, sizeof(path), "%s/dev", d->d_name);
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
 lib/loopdev.c | 2 +-
 lib/sysfs.c   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/loopdev.c b/lib/loopdev.c
index 00066823c..8c653a361 100644
--- a/lib/loopdev.c
+++ b/lib/loopdev.c
@@ -532,7 +532,7 @@ static int loopcxt_next_from_sysfs(struct loopdev_cxt *lc)
 	fd = dirfd(iter->sysblock);
 
 	while ((d = readdir(iter->sysblock))) {
-		char name[256];
+		char name[NAME_MAX + 18 + 1];
 		struct stat st;
 
 		DBG(ITER, ul_debugobj(iter, "check %s", d->d_name));
diff --git a/lib/sysfs.c b/lib/sysfs.c
index cc290faac..68b43aaa3 100644
--- a/lib/sysfs.c
+++ b/lib/sysfs.c
@@ -307,7 +307,7 @@ static struct dirent *xreaddir(DIR *dp)
 
 int sysfs_is_partition_dirent(DIR *dir, struct dirent *d, const char *parent_name)
 {
-	char path[256];
+	char path[NAME_MAX + 6 + 1];
 
 #ifdef _DIRENT_HAVE_D_TYPE
 	if (d->d_type != DT_DIR &&
@@ -356,7 +356,7 @@ dev_t sysfs_partno_to_devno(struct sysfs_cxt *cxt, int partno)
 {
 	DIR *dir;
 	struct dirent *d;
-	char path[256];
+	char path[NAME_MAX + 10 + 1];
 	dev_t devno = 0;
 
 	dir = sysfs_opendir(cxt, NULL);
-- 
2.12.3

[PATCH 6/6] libblkid: fix gcc-7 warning -Wint-in-bool-context

[Ruediger Meier]

From: Ruediger Meier <ruediger.meier@ga-group.nl>

BLOCK_SIZE(sb) should be unsigned so that the left shift is defined.

This was the warning:

../libblkid/src/superblocks/exfat.c: In function 'probe_exfat':
../libblkid/src/superblocks/exfat.c:40:42: warning: '<<' in boolean context, did you mean '<' ? [-Wint-in-bool-context]
 #define CLUSTER_SIZE(sb) (BLOCK_SIZE(sb) << (sb)->bpc_bits)
                          ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~
../libblkid/src/superblocks/exfat.c:122:14: note: in expansion of macro 'CLUSTER_SIZE'
  if (!sb || !CLUSTER_SIZE(sb))
              ^~~~~~~~~~~~

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
 libblkid/src/superblocks/exfat.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libblkid/src/superblocks/exfat.c b/libblkid/src/superblocks/exfat.c
index 659e196c2..f5a22ee81 100644
--- a/libblkid/src/superblocks/exfat.c
+++ b/libblkid/src/superblocks/exfat.c
@@ -36,8 +36,8 @@ struct exfat_entry_label {
 	uint8_t name[30];
 } __attribute__((__packed__));
 
-#define BLOCK_SIZE(sb) (1 << (sb)->block_bits)
-#define CLUSTER_SIZE(sb) (BLOCK_SIZE(sb) << (sb)->bpc_bits)
+#define BLOCK_SIZE(sb) (1u << (sb)->block_bits)
+#define CLUSTER_SIZE(sb) ((BLOCK_SIZE(sb) << (sb)->bpc_bits))
 #define EXFAT_FIRST_DATA_CLUSTER 2
 #define EXFAT_LAST_DATA_CLUSTER 0xffffff6
 #define EXFAT_ENTRY_SIZE 32
-- 
2.12.3

Re: [PATCH 5/6] misc: fix gcc-7 snprintf warnings -Wformat-truncation

[Rüdiger Meier]

BTW there is another of these warnings left, see below. I'm not sure here what
to do. Note, it's pssible to silent this warning also by _using_ snprintf's
return value.

../libblkid/src/partitions/partitions.c:1371:45: warning: '%02x' directive output may be truncated writing between 2 and 8 bytes into a region of size between 0 and 36 [-Wformat-truncation=]
   snprintf(par->uuid, sizeof(par->uuid), "%s-%02x",
                                              ^~~~
../libblkid/src/partitions/partitions.c:1371:41: note: using the range [0, 4294967295] for directive argument
   snprintf(par->uuid, sizeof(par->uuid), "%s-%02x",
                                          ^~~~~~~~~
../libblkid/src/partitions/partitions.c:1371:2: note: 'snprintf' output between 4 and 46 bytes into a destination of size 37
   snprintf(par->uuid, sizeof(par->uuid), "%s-%02x",
   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     par->tab->id, par->partno);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~

Re: [PATCH 0/6] fix various minor issues and warnings

[Karel Zak]

On Mon, Jun 12, 2017 at 10:49:52AM +0200, Ruediger Meier wrote:
> From: Ruediger Meier <ruediger.meier@ga-group.nl>
> 
> Ruediger Meier (6):
>   tests: fix fincore, don't use variable COLUMNS
>   libmount: btrfs, remove unused setter functions
>   hwclock: fix warning [-Winvalid-noreturn]
>   misc: fix gcc-7 sprintf warnings -Wformat-overflow
>   misc: fix gcc-7 snprintf warnings -Wformat-truncation
>   libblkid: fix gcc-7 warning -Wint-in-bool-context
> 
>  lib/loopdev.c                    |  2 +-
>  lib/sysfs.c                      |  4 ++--
>  libblkid/src/devname.c           |  2 +-
>  libblkid/src/superblocks/exfat.c |  4 ++--
>  libmount/src/btrfs.c             |  4 ----
>  login-utils/last.c               |  2 +-
>  sys-utils/hwclock.c              |  2 +-
>  sys-utils/hwclock.h              |  3 ++-
>  tests/ts/fincore/count           | 12 ++++++------
>  9 files changed, 16 insertions(+), 19 deletions(-)

Seems better than the previous version from Sami (May 27).

    Karel


-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

Re: [PATCH 0/6] fix various minor issues and warnings

[Rüdiger Meier]

On 06/13/2017 03:47 PM, Karel Zak wrote:
> On Mon, Jun 12, 2017 at 10:49:52AM +0200, Ruediger Meier wrote:
>> From: Ruediger Meier <ruediger.meier@ga-group.nl>
>>
>> Ruediger Meier (6):
>>    tests: fix fincore, don't use variable COLUMNS
>>    libmount: btrfs, remove unused setter functions
>>    hwclock: fix warning [-Winvalid-noreturn]
>>    misc: fix gcc-7 sprintf warnings -Wformat-overflow
>>    misc: fix gcc-7 snprintf warnings -Wformat-truncation
>>    libblkid: fix gcc-7 warning -Wint-in-bool-context
>>
>>   lib/loopdev.c                    |  2 +-
>>   lib/sysfs.c                      |  4 ++--
>>   libblkid/src/devname.c           |  2 +-
>>   libblkid/src/superblocks/exfat.c |  4 ++--
>>   libmount/src/btrfs.c             |  4 ----
>>   login-utils/last.c               |  2 +-
>>   sys-utils/hwclock.c              |  2 +-
>>   sys-utils/hwclock.h              |  3 ++-
>>   tests/ts/fincore/count           | 12 ++++++------
>>   9 files changed, 16 insertions(+), 19 deletions(-)
> 
> Seems better than the previous version from Sami (May 27).

These fixed are completely independent/unrelated to the other pull
request from Sami. Sami's PR just motivated me to try out gcc-7 too.

cu,
Rudi

Re: [PATCH 0/6] fix various minor issues and warnings

[Karel Zak]

On Tue, Jun 13, 2017 at 05:18:33PM +0200, Rüdiger Meier wrote:
> On 06/13/2017 03:47 PM, Karel Zak wrote:
> > On Mon, Jun 12, 2017 at 10:49:52AM +0200, Ruediger Meier wrote:
> > > From: Ruediger Meier <ruediger.meier@ga-group.nl>
> > > 
> > > Ruediger Meier (6):
> > >    tests: fix fincore, don't use variable COLUMNS
> > >    libmount: btrfs, remove unused setter functions
> > >    hwclock: fix warning [-Winvalid-noreturn]
> > >    misc: fix gcc-7 sprintf warnings -Wformat-overflow
> > >    misc: fix gcc-7 snprintf warnings -Wformat-truncation
> > >    libblkid: fix gcc-7 warning -Wint-in-bool-context
> > > 
> > >   lib/loopdev.c                    |  2 +-
> > >   lib/sysfs.c                      |  4 ++--
> > >   libblkid/src/devname.c           |  2 +-
> > >   libblkid/src/superblocks/exfat.c |  4 ++--
> > >   libmount/src/btrfs.c             |  4 ----
> > >   login-utils/last.c               |  2 +-
> > >   sys-utils/hwclock.c              |  2 +-
> > >   sys-utils/hwclock.h              |  3 ++-
> > >   tests/ts/fincore/count           | 12 ++++++------
> > >   9 files changed, 16 insertions(+), 19 deletions(-)
> > 
> > Seems better than the previous version from Sami (May 27).
> 
> These fixed are completely independent/unrelated to the other pull
> request from Sami. Sami's PR just motivated me to try out gcc-7 too.

Yep, you both tried to fix the sprintf warnings, your version with
NAME_MAX seems better.

Applied, thanks.

    Karel

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

Re: [PATCH 0/6] fix various minor issues and warnings

[Ruediger Meier]

On Wednesday 14 June 2017, Karel Zak wrote:
> On Tue, Jun 13, 2017 at 05:18:33PM +0200, R=FCdiger Meier wrote:
> > On 06/13/2017 03:47 PM, Karel Zak wrote:
> > > On Mon, Jun 12, 2017 at 10:49:52AM +0200, Ruediger Meier wrote:
> > > > From: Ruediger Meier <ruediger.meier@ga-group.nl>
> > > >
> > > > Ruediger Meier (6):
> > > >    tests: fix fincore, don't use variable COLUMNS
> > > >    libmount: btrfs, remove unused setter functions
> > > >    hwclock: fix warning [-Winvalid-noreturn]
> > > >    misc: fix gcc-7 sprintf warnings -Wformat-overflow
> > > >    misc: fix gcc-7 snprintf warnings -Wformat-truncation
> > > >    libblkid: fix gcc-7 warning -Wint-in-bool-context
> > > >
> > > >   lib/loopdev.c                    |  2 +-
> > > >   lib/sysfs.c                      |  4 ++--
> > > >   libblkid/src/devname.c           |  2 +-
> > > >   libblkid/src/superblocks/exfat.c |  4 ++--
> > > >   libmount/src/btrfs.c             |  4 ----
> > > >   login-utils/last.c               |  2 +-
> > > >   sys-utils/hwclock.c              |  2 +-
> > > >   sys-utils/hwclock.h              |  3 ++-
> > > >   tests/ts/fincore/count           | 12 ++++++------
> > > >   9 files changed, 16 insertions(+), 19 deletions(-)
> > >
> > > Seems better than the previous version from Sami (May 27).
> >
> > These fixed are completely independent/unrelated to the other pull
> > request from Sami. Sami's PR just motivated me to try out gcc-7
> > too.
>
> Yep, you both tried to fix the sprintf warnings, your version with
> NAME_MAX seems better.

Ooops, I didn't even noticed and could merge all together without=20
confilcts.

> Applied, thanks.
>
>     Karel