From: Eric Sandeen <sandeen@sandeen.net>
To: xfs-oss <xfs@oss.sgi.com>
Subject: [PATCH V2] xfsprogs: use ASSERT_ALWAYS for impossible switch case
Date: Thu, 21 Aug 2014 13:27:02 -0500 [thread overview]
Message-ID: <53F639F6.6050905@sandeen.net> (raw)
In-Reply-To: <53F62D12.8010505@sandeen.net>
The original reason for the expletive below has been lost
in the mists of time, but at any rate, ASSERT() goes away in
libxfs, and this leads static analysis checkers to believe that
XFS_BTNUM_MAX is possible, and that we might overflow an array
later when using it as an index.
We can shut this up and mark it as truly impossible by adding
a userspace definition for ASSERT_ALWAYS and using it.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---
V2: do it in a kernel-compatible way.
diff --git a/include/xfs_btree.h b/include/xfs_btree.h
index 2590d40..f24f787 100644
--- a/include/xfs_btree.h
+++ b/include/xfs_btree.h
@@ -69,7 +69,7 @@ do { \
case XFS_BTNUM_BMAP: __XFS_BTREE_STATS_INC(bmbt, stat); break; \
case XFS_BTNUM_INO: __XFS_BTREE_STATS_INC(ibt, stat); break; \
case XFS_BTNUM_FINO: __XFS_BTREE_STATS_INC(fibt, stat); break; \
- case XFS_BTNUM_MAX: ASSERT(0); /* fucking gcc */ ; break; \
+ case XFS_BTNUM_MAX: ASSERT_ALWAYS(0); /* fucking gcc */ ; break; \
} \
} while (0)
@@ -83,7 +83,7 @@ do { \
case XFS_BTNUM_BMAP: __XFS_BTREE_STATS_ADD(bmbt, stat, val); break; \
case XFS_BTNUM_INO: __XFS_BTREE_STATS_ADD(ibt, stat, val); break; \
case XFS_BTNUM_FINO: __XFS_BTREE_STATS_ADD(fibt, stat, val); break; \
- case XFS_BTNUM_MAX: ASSERT(0); /* fucking gcc */ ; break; \
+ case XFS_BTNUM_MAX: ASSERT_ALWAYS(0); /* fucking gcc */ ; break; \
} \
} while (0)
diff --git a/libxfs/xfs.h b/libxfs/xfs.h
index 30a316d..81d7cd9 100644
--- a/libxfs/xfs.h
+++ b/libxfs/xfs.h
@@ -48,6 +48,10 @@
#undef ASSERT
#define ASSERT(ex) assert(ex)
+#undef ASSERT_ALWAYS
+#define ASSERT_ALWAYS(ex) \
+ (unlikely(ex) ? (void)0 : abort())
+
typedef __uint32_t uint_t;
typedef __uint32_t inst_t; /* an instruction */
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2014-08-21 18:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-21 17:32 [PATCH] xfsprogs: use abort() not ASSERT(0) for impossible switch case Eric Sandeen
2014-08-21 17:44 ` Christoph Hellwig
2014-08-21 17:45 ` Eric Sandeen
2014-08-21 18:27 ` Eric Sandeen [this message]
2014-08-21 22:55 ` [PATCH V2] xfsprogs: use ASSERT_ALWAYS " Dave Chinner
2014-08-21 22:50 ` [PATCH] xfsprogs: use abort() not ASSERT(0) " Dave Chinner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53F639F6.6050905@sandeen.net \
--to=sandeen@sandeen.net \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox