e2fsprogs: add (optional) sparse checking to the build

Run sparse against source files when building e2fsprogs with 'make C=1'.  If
instead C=2, it configures basic ext2 types for bitwise checking with sparse,
which can help find the (many many) spots where conversion errors are
(possibly) happening.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/Makefile.in b/Makefile.in
index 544ed0299480cbd4b2fbc5b4a8886a855b5ce16f..95cbf1b473630db8f97efbc78095b7ec0bb58948 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,6 +5,19 @@ top_builddir = .
 my_dir = .
 INSTALL = @INSTALL@
 
+CHECK=sparse
+CHECK_OPTS=-Wsparse-all -Wno-transparent-union -Wno-return-void -Wno-undef -Wno-non-pointer-null
+ifeq ("$(C)", "2")
+  CHECK_CMD=$(CHECK) $(CHECK_OPTS) -Wbitwise -D__CHECK_ENDIAN__
+else
+  ifeq ("$(C)", "1")
+    CHECK_CMD=$(CHECK) $(CHECK_OPTS)
+   else
+    CHECK_CMD=@true
+  endif
+endif
+export CHECK_CMD
+
 @MCONFIG@
 
 % : %.sh

diff --git a/debugfs/Makefile.in b/debugfs/Makefile.in
index 9a86dc66e8c7dd0bd4b08965d5f075b0d12dbcc7..bf037e025465bdd71b258bc1ac803ac53a0cb438 100644 (file)
--- a/debugfs/Makefile.in
+++ b/debugfs/Makefile.in
@@ -44,6 +44,7 @@ STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBSS) \
 .c.o:
        $(E) "  CC $<"
        $(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
+       $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 
 all:: $(PROGS) $(MANPAGES)
 

diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
index eadd5eaa0169dc67004d2a9c52477cacfee4c44e..8e1c891e01127253739668a5948b9d7a966b703f 100644 (file)
--- a/e2fsck/Makefile.in
+++ b/e2fsck/Makefile.in
@@ -38,6 +38,7 @@ COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
 .c.o:
        $(E) "  CC $<"
        $(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
+       $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 
 #

diff --git a/ext2ed/Makefile.in b/ext2ed/Makefile.in
index b3b606a68aa8b8e95e5dc0aaacca6612f5d8a4a6..290f06e85fa685c33615b71c800933619acdddc6 100644 (file)
--- a/ext2ed/Makefile.in
+++ b/ext2ed/Makefile.in
@@ -33,6 +33,7 @@ DOCS=   doc/ext2ed-design.pdf doc/user-guide.pdf doc/ext2fs-overview.pdf \
 
 .c.o:
        $(CC) -c $(ALL_CFLAGS) $< -o $@
+       $(CHECK_CMD) $(ALL_CFLAGS) $<
 
 .SUFFIXES: .sgml .ps .pdf .html
 

diff --git a/intl/Makefile.in b/intl/Makefile.in
index 9dbc84e9e057b2cc9f8b0ee2b9d8bdb9857bbef2..bf24f63fc2fdfcd38e9d2ab2aac9bd55d63372bd 100644 (file)
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -191,6 +191,7 @@ LTV_AGE=4
 .c.o:
        $(E) "  CC $<"
        $(Q) $(COMPILE) $<
+       $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 
 .y.c:
        $(YACC) $(YFLAGS) --output $@ $<

diff --git a/lib/blkid/Makefile.in b/lib/blkid/Makefile.in
index 0ec8564c9816061f3836c402dce3c60c0afcd565..3f15c6779ef6548176591930184b371e09634a0c 100644 (file)
--- a/lib/blkid/Makefile.in
+++ b/lib/blkid/Makefile.in
@@ -55,6 +55,7 @@ DEPLIBS_BLKID=        $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID)
 .c.o:
        $(E) "  CC $<"
        $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
+       $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 @CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 @ELF_CMT@      $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<

diff --git a/lib/e2p/Makefile.in b/lib/e2p/Makefile.in
index e2d094028342605f223c48925e73b5a46c6a6b68..d6992fc5276a77c8c64fee01e08ecc0601168b34 100644 (file)
--- a/lib/e2p/Makefile.in
+++ b/lib/e2p/Makefile.in
@@ -55,6 +55,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
 .c.o:
        $(E) "  CC $<"
        $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
+       $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 @CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 @ELF_CMT@      $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<

diff --git a/lib/et/Makefile.in b/lib/et/Makefile.in
index 8d1ea26b8e1bfed2dbbb735c83d487987a51edb4..fd4e6e28dd20fdfa5abe9543d87e62ee026b24c8 100644 (file)
--- a/lib/et/Makefile.in
+++ b/lib/et/Makefile.in
@@ -43,6 +43,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
 .c.o:
        $(E) "  CC $<"
        $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
+       $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 @CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 @ELF_CMT@      $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<

diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in
index cc0fc7e77829864a24aed48a30b3ef7f1db95988..abe2124737c32176d351b42592bf4a37a750f0f2 100644 (file)
--- a/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@ -200,6 +200,7 @@ all:: ext2fs.pc
 .c.o:
        $(E) "  CC $<"
        $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
+       $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 @CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 @ELF_CMT@      $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<

diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index e3920d0b2bc3ee98cfd9c0c4522e272f40c33452..b7a784eec5cc865a4b4bcee504a847d44868bea2 100644 (file)
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -64,14 +64,20 @@ extern "C" {
 #include <ext2fs/ext3_extents.h>
 #endif /* EXT2_FLAT_INCLUDES */
 
-typedef __u32          ext2_ino_t;
-typedef __u32          blk_t;
-typedef __u64          blk64_t;
-typedef __u32          dgrp_t;
-typedef __u32          ext2_off_t;
-typedef __u64          ext2_off64_t;
-typedef __s64          e2_blkcnt_t;
-typedef __u32          ext2_dirhash_t;
+#ifdef __CHECK_ENDIAN__
+#define __bitwise __attribute__((bitwise))
+#else
+#define __bitwise
+#endif
+
+typedef __u32 __bitwise                ext2_ino_t;
+typedef __u32 __bitwise                blk_t;
+typedef __u64 __bitwise                blk64_t;
+typedef __u32 __bitwise                dgrp_t;
+typedef __u32 __bitwise                ext2_off_t;
+typedef __u64 __bitwise                ext2_off64_t;
+typedef __s64 __bitwise                e2_blkcnt_t;
+typedef __u32 __bitwise                ext2_dirhash_t;
 
 #if EXT2_FLAT_INCLUDES
 #include "com_err.h"

diff --git a/lib/quota/Makefile.in b/lib/quota/Makefile.in
index 720befd98417813e63607393fc4cb030b06ef379..ec4f6c45824fd77d4ee24e6a5e1b50e2a8329fca 100644 (file)
--- a/lib/quota/Makefile.in
+++ b/lib/quota/Makefile.in
@@ -47,6 +47,7 @@ LIBDIR= quota
 .c.o:
        $(E) "  CC $<"
        $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
+       $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 @CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 #ELF_CMT#      $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<

diff --git a/lib/ss/Makefile.in b/lib/ss/Makefile.in
index c396f2deb8d9f73c441bb93e5d9c27bd606880c9..1b23b38d99a4bc2f2ca6786a2f52d6548c9bb215 100644 (file)
--- a/lib/ss/Makefile.in
+++ b/lib/ss/Makefile.in
@@ -34,6 +34,7 @@ MK_CMDS=_SS_DIR_OVERRIDE=. ./mk_cmds
 .c.o:
        $(E) "  CC $<"
        $(Q) $(CC) $(ALL_CFLAGS) -c $<
+       $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 @CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 @ELF_CMT@      $(Q) $(CC) $(ALL_CFLAGS) -DSHARED_ELF_LIB -fPIC -o elfshared/$*.o -c $<

diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in
index 7329467e97dc364b555dde6b834889d5d9b77baa..14d08c164756efec614355b6faeeed1a360931fc 100644 (file)
--- a/lib/uuid/Makefile.in
+++ b/lib/uuid/Makefile.in
@@ -62,6 +62,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
 .c.o:
        $(E) "  CC $<"
        $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
+       $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 @CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 @ELF_CMT@      $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<

diff --git a/misc/Makefile.in b/misc/Makefile.in
index 8a69855ac999c7b59f0f22711578c09e234d7179..a798f961a0220aacad9f4d373fd409dbf5203aad 100644 (file)
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -100,6 +100,7 @@ COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
 .c.o:
        $(E) "  CC $<"
        $(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
+       $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 
 all:: profiled $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \

diff --git a/resize/Makefile.in b/resize/Makefile.in
index a06b642bd7d0a56d34c2563a6e5de0dbc902e3ea..b8fb3ae4b28d6ecb8316fbebe1f97dddc3fea19d 100644 (file)
--- a/resize/Makefile.in
+++ b/resize/Makefile.in
@@ -38,6 +38,7 @@ DEPSTATIC_LIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBCOM_ERR)
 .c.o:
        $(E) "  CC $<"
        $(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
+       $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 
 all:: $(PROGS) $(TEST_PROGS) $(MANPAGES) 
 

diff --git a/tests/progs/Makefile.in b/tests/progs/Makefile.in
index e3c1ef4fca2856d83e0724ad448140de246ae946..37abf23252fad68a8bd1d361f41b5a746b4cf908 100644 (file)
--- a/tests/progs/Makefile.in
+++ b/tests/progs/Makefile.in
@@ -27,6 +27,7 @@ DEPLIBS= $(LIBEXT2FS) $(DEPLIBSS) $(DEPLIBCOM_ERR)
 .c.o:
        $(E) "  CC $<"
        $(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
+       $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 
 all:: $(PROGS)
 

diff --git a/util/Makefile.in b/util/Makefile.in
index adf0b46158ba549d1455c9ee0cf5b33c703ab6e1..76c3f88accd3977eec7d0f711084614d729ebccf 100644 (file)
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -16,6 +16,7 @@ SRCS = $(srcdir)/subst.c
 .c.o:
        $(E) "  CC $<"
        $(Q) $(BUILD_CC) -c $(BUILD_CFLAGS) $< -o $@
+       $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 
 PROGS=         subst symlinks