From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: sandeen@redhat.com
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH v2 10/10] misc: fix ubsan warnings
Date: Fri, 27 Oct 2017 09:19:35 -0700 [thread overview]
Message-ID: <20171027161935.GJ5483@magnolia> (raw)
In-Reply-To: <150905615569.28563.17233201567221670601.stgit@magnolia>
Fix all the things ubsan warned about.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
include/bitops.h | 8 ++++----
include/command.h | 6 +++---
include/xfs_arch.h | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/bitops.h b/include/bitops.h
index 44599a7..7774950 100644
--- a/include/bitops.h
+++ b/include/bitops.h
@@ -13,19 +13,19 @@ static inline int fls(int x)
if (!x)
return 0;
if (!(x & 0xffff0000u)) {
- x <<= 16;
+ x = (x & 0xffffu) << 16;
r -= 16;
}
if (!(x & 0xff000000u)) {
- x <<= 8;
+ x = (x & 0xffffffu) << 8;
r -= 8;
}
if (!(x & 0xf0000000u)) {
- x <<= 4;
+ x = (x & 0xfffffffu) << 4;
r -= 4;
}
if (!(x & 0xc0000000u)) {
- x <<= 2;
+ x = (x & 0x3fffffffu) << 2;
r -= 2;
}
if (!(x & 0x80000000u)) {
diff --git a/include/command.h b/include/command.h
index fb3f5c7..a7fe6eb 100644
--- a/include/command.h
+++ b/include/command.h
@@ -25,9 +25,9 @@
* not iterate the command args function callout and so can be used
* for functions like "help" that should only ever be run once.
*/
-#define CMD_FLAG_ONESHOT (1<<31)
-#define CMD_FLAG_FOREIGN_OK (1<<30) /* command not restricted to XFS */
-#define CMD_FLAG_LIBRARY (1<<29) /* command provided by libxcmd */
+#define CMD_FLAG_ONESHOT (1u << 31)
+#define CMD_FLAG_FOREIGN_OK (1u << 30) /* command not restricted to XFS */
+#define CMD_FLAG_LIBRARY (1u << 29) /* command provided by libxcmd */
typedef int (*cfunc_t)(int argc, char **argv);
typedef void (*helpfunc_t)(void);
diff --git a/include/xfs_arch.h b/include/xfs_arch.h
index 186cadb..34fcd4d 100644
--- a/include/xfs_arch.h
+++ b/include/xfs_arch.h
@@ -253,7 +253,7 @@ static inline uint16_t get_unaligned_be16(void *p)
static inline uint32_t get_unaligned_be32(void *p)
{
uint8_t *__p = p;
- return __p[0] << 24 | __p[1] << 16 | __p[2] << 8 | __p[3];
+ return (uint32_t)__p[0] << 24 | __p[1] << 16 | __p[2] << 8 | __p[3];
}
static inline uint64_t get_unaligned_be64(void *p)
next prev parent reply other threads:[~2017-10-27 16:19 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-26 22:14 [PATCH 00/10] xfsprogs: 4.14 rollup Darrick J. Wong
2017-10-26 22:14 ` [PATCH 01/10] db: increase metadump's default overly long extent discard threshold Darrick J. Wong
2017-10-27 0:03 ` Eric Sandeen
2017-10-27 0:12 ` Darrick J. Wong
2017-10-26 22:15 ` [PATCH 02/10] xfsprogs: explicitly cast troublesome types to match printf format specifiers Darrick J. Wong
2017-10-27 0:06 ` Eric Sandeen
2017-10-26 22:15 ` [PATCH 03/10] xfs_io: add new error injection knobs to inject command Darrick J. Wong
2017-10-27 0:09 ` Eric Sandeen
2017-10-26 22:15 ` [PATCH 04/10] xfs_repair: fix bag memory overwrite problems Darrick J. Wong
2017-10-27 0:49 ` Eric Sandeen
2017-10-26 22:15 ` [PATCH 05/10] xfs_repair: clear DAX flag from non-file inodes Darrick J. Wong
2017-10-27 2:01 ` Eric Sandeen
2017-10-26 22:15 ` [PATCH 06/10] xfs_repair: fix cowextsize field checking and repairing Darrick J. Wong
2017-10-27 2:06 ` Eric Sandeen
2017-10-27 16:17 ` Darrick J. Wong
2017-10-27 16:27 ` Eric Sandeen
2017-10-26 22:15 ` [PATCH 07/10] misc: enable ubsan if it's available Darrick J. Wong
2017-10-26 22:23 ` [PATCH v2] misc: enable ubsan if the builder wants it Darrick J. Wong
2017-10-26 22:15 ` [PATCH 08/10] misc: enable gcc/clang address sanitizer Darrick J. Wong
2017-10-26 22:24 ` [PATCH v2 " Darrick J. Wong
2017-10-26 22:15 ` [PATCH 09/10] misc: enable thread Darrick J. Wong
2017-10-26 22:24 ` [PATCH v2 09/10] misc: enable thread sanitizer if requested Darrick J. Wong
2017-10-26 22:15 ` [PATCH 10/10] misc: fix ubsan warnings Darrick J. Wong
2017-10-27 13:48 ` Eric Sandeen
2017-10-27 16:14 ` Darrick J. Wong
2017-10-27 16:24 ` Eric Sandeen
2017-10-27 16:19 ` Darrick J. Wong [this message]
2017-10-26 22:32 ` [PATCH 00/10] xfsprogs: 4.14 rollup Goldwyn Rodrigues
2017-10-27 0:01 ` Eric Sandeen
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=20171027161935.GJ5483@magnolia \
--to=darrick.wong@oracle.com \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@redhat.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