From 832cb612f8c1c10525fe438206d4fe5c6d38a4e7 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Fri, 11 Oct 2013 23:02:12 -0400 Subject: [PATCH] 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 Signed-off-by: "Theodore Ts'o" --- Makefile.in | 13 +++++++++++++ debugfs/Makefile.in | 1 + e2fsck/Makefile.in | 1 + ext2ed/Makefile.in | 1 + intl/Makefile.in | 1 + lib/blkid/Makefile.in | 1 + lib/e2p/Makefile.in | 1 + lib/et/Makefile.in | 1 + lib/ext2fs/Makefile.in | 1 + lib/ext2fs/ext2fs.h | 22 ++++++++++++++-------- lib/quota/Makefile.in | 1 + lib/ss/Makefile.in | 1 + lib/uuid/Makefile.in | 1 + misc/Makefile.in | 1 + resize/Makefile.in | 1 + tests/progs/Makefile.in | 1 + util/Makefile.in | 1 + 17 files changed, 42 insertions(+), 8 deletions(-) diff --git a/Makefile.in b/Makefile.in index 544ed0299..95cbf1b47 100644 --- 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 9a86dc66e..bf037e025 100644 --- 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 eadd5eaa0..8e1c891e0 100644 --- 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 b3b606a68..290f06e85 100644 --- 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 9dbc84e9e..bf24f63fc 100644 --- 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 0ec8564c9..3f15c6779 100644 --- 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 e2d094028..d6992fc52 100644 --- 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 8d1ea26b8..fd4e6e28d 100644 --- 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 cc0fc7e77..abe212473 100644 --- 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 e3920d0b2..b7a784eec 100644 --- a/lib/ext2fs/ext2fs.h +++ b/lib/ext2fs/ext2fs.h @@ -64,14 +64,20 @@ extern "C" { #include #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 720befd98..ec4f6c458 100644 --- 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 c396f2deb..1b23b38d9 100644 --- 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 7329467e9..14d08c164 100644 --- 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 8a69855ac..a798f961a 100644 --- 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 a06b642bd..b8fb3ae4b 100644 --- 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 e3c1ef4fc..37abf2325 100644 --- 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 adf0b4615..76c3f88ac 100644 --- 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 -- 2.47.2