From: Sami Liedes <sami.liedes@iki.fi>
To: linux-ext4@vger.kernel.org
Subject: [PATCH 5/8] e2fsck/revoke.c: Fix undefined behavior in hash()
Date: Fri, 14 Dec 2012 00:04:27 +0200 [thread overview]
Message-ID: <20121213220426.GM9713@sli.dy.fi> (raw)
In-Reply-To: <cover.1355435985.git.sami.liedes@iki.fi>
There's a shift by (hash_shift - 12) in hash(), but hash() is called
with hash_shift=10, resulting in a negative shift and thus undefined
behavior.
A simple and stupid minimal fix is to just change the subtracted
amount to 10.
Caught by clang -fsanitize=undefined.
Signed-off-by: Sami Liedes <sami.liedes@iki.fi>
---
e2fsck/revoke.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/e2fsck/revoke.c b/e2fsck/revoke.c
index 38c265e..dddef4d 100644
--- a/e2fsck/revoke.c
+++ b/e2fsck/revoke.c
@@ -115,7 +115,7 @@ static inline int hash(journal_t *journal, unsigned long block)
return ((block << (hash_shift - 6)) ^
(block >> 13) ^
- (block << (hash_shift - 12))) & (table->hash_size - 1);
+ (block << (hash_shift - 10))) & (table->hash_size - 1);
}
static int insert_revoke_hash(journal_t *journal, unsigned long blocknr,
--
1.7.10.4
next prev parent reply other threads:[~2012-12-13 22:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1355435985.git.sami.liedes@iki.fi>
2012-12-13 22:04 ` [PATCH 1/8] lib/blkid/list.h: Fix undefined behavior in list_entry() macro Sami Liedes
2012-12-13 22:04 ` [PATCH 2/8] lib/ext2fs/rbtree.h: Fix container_of() undefined behavior Sami Liedes
2012-12-13 22:04 ` [PATCH 3/8] e2fsck/pass1.c: Fix undefined behavior in check_blocks() Sami Liedes
2012-12-13 22:04 ` [PATCH 4/8] lib/ext2fs/block.c: Fix undefined behavior in block_iterate_tind() Sami Liedes
2012-12-13 22:04 ` Sami Liedes [this message]
2012-12-13 22:04 ` [PATCH 6/8] lib/ext2fs/kernel-list.h: Fix undefined behavior in list_entry() macro Sami Liedes
2012-12-13 22:04 ` [PATCH 7/8] lib/ext2fs/qcow2.h: Fix #defined 1<<63 values to be unsigned Sami Liedes
2012-12-13 22:04 ` [PATCH 8/8] e2fsck/jfs_user.h: Fix b_data alignment in struct buffer_head Sami Liedes
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=20121213220426.GM9713@sli.dy.fi \
--to=sami.liedes@iki.fi \
--cc=linux-ext4@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).