build / build (clang, ) (push) Failing after 7s
build / build (clang, --enable-warnings) (push) Failing after 5s
build / build (gcc, ) (push) Failing after 5s
build / build (gcc, --enable-io-failure-emulation) (push) Failing after 5s
build / build (gcc, --enable-warnings) (push) Failing after 6s
build / out-of-tree (push) Failing after 6s
build / sanitizers (push) Failing after 5s
Clang (22.1.8 on the host, 14.0.6 in the Debian VM) now builds the tree
warning-free with --enable-warnings, in-tree and out-of-tree, with -j, and
the full VM battery passes with CC=clang: 12/12. ASan/UBSan builds run the
real tool paths (mkfs, check, tune, resize, rollback save/restore/reject)
with halt_on_error and report zero errors. Documented in tests/vm/RESULTS.md;
the CI gained clang+warnings, out-of-tree and sanitizer jobs.
Fixes found by this work:
- reiserfscore/Makefile.am: reiserfs_err.c and reiserfs_err.h shared one
recipe. With -j, make runs the recipe once per stale target, so two
compile_et invocations race: one deletes reiserfs_err.c ("no input
files") while another job compiles it. Attached the recipe to
reiserfs_err.c only; reiserfs_err.h merely depends on it. Reproduced
with clang+ASan, stable across 5 clang / 3 asan / 3 gcc parallel builds.
- reiserfscore/Makefile.am: the rule read the source-local
reiserfs_err.et, so VPATH builds could not find it. Use $(srcdir)/.
make distcheck now passes.
- reiserfscore/reiserfslib.c: reiserfs_close() did fsync(fs->fs_dev) after
reiserfs_free() released fs -- a 4-byte heap-use-after-free, flagged
exactly at reiserfslib.c:406/407 by ASan (found by clang+ASan; gcc never
caught it because the freed heap usually still holds the old value).
Moved fsync before the free; reiserfs_flush() has already written
journal and dirty buffers at that point and free_buffers() never
writes, so the ordering preserves durability semantics.
- fsck/semantic_check.c, fsck/semantic_rebuild.c: three %K arguments passed
&tmp_deh->deh2_dir_id where a struct reiserfs_key * is expected. It
printed the right values only because deh2_dir_id sits at offset 4 and
the key is read from the pointer as if dir_id sat at offset 0. Build a
proper local key with set_key_dirid()/set_key_objectid() (the same
idiom debugreiserfs/scan.c already uses). Verified -Waddress-of-packed-
member (clang-only) is gone and output is unchanged.
- reiserfscore/hashes.c: four unreachable *(int *)0 = 0 stores (guarded by
len >= 16/12/8/4 tests that cannot hold after the while (len >= 16)
loop, len <= 15). Removed; clang's -Wnull-dereference goes quiet.
Behavior verified: keyed_hash/yura_hash/r5_hash outputs for 16 inputs
from 0 to 17 bytes are byte-identical before and after.
run_in_vm.sh: propagate CC into the guest, force a remount of /mnt/data
(the host rewrites the backing file under the guest), exclude generated
reiserfs_err.[ch] from the source tar. run_tests.sh: report which compiler
the battery actually used.
187 lines
3.6 KiB
C
187 lines
3.6 KiB
C
/*
|
|
* Copyright 1996-2004 by Hans Reiser, licensing governed by
|
|
* reiserfsprogs/README
|
|
*/
|
|
|
|
/*
|
|
* Keyed 32-bit hash function using TEA in a Davis-Meyer function
|
|
* H0 = Key
|
|
* Hi = E Mi(Hi-1) + Hi-1
|
|
*
|
|
* (see Applied Cryptography, 2nd edition, p448).
|
|
*
|
|
* Jeremy Fitzhardinge <jeremy@zip.com.au> 1998
|
|
*
|
|
* Jeremy has agreed to the contents of reiserfs/README. -Hans
|
|
* Yura's function is added (04/07/2000)
|
|
*/
|
|
|
|
//
|
|
// keyed_hash
|
|
// yura_hash
|
|
// r5
|
|
//
|
|
|
|
#include <linux/types.h>
|
|
|
|
#define DELTA 0x9E3779B9
|
|
#define FULLROUNDS 10 /* 32 is overkill, 16 is strong crypto */
|
|
#define PARTROUNDS 6 /* 6 gets complete mixing */
|
|
|
|
#ifndef __KERNEL__
|
|
typedef __u32 u32;
|
|
#endif
|
|
|
|
/* a, b, c, d - data; h0, h1 - accumulated hash */
|
|
#define TEACORE(rounds) \
|
|
do { \
|
|
u32 sum = 0; \
|
|
int n = rounds; \
|
|
u32 b0, b1; \
|
|
\
|
|
b0 = h0; \
|
|
b1 = h1; \
|
|
\
|
|
do \
|
|
{ \
|
|
sum += DELTA; \
|
|
b0 += ((b1 << 4)+a) ^ (b1+sum) ^ ((b1 >> 5)+b); \
|
|
b1 += ((b0 << 4)+c) ^ (b0+sum) ^ ((b0 >> 5)+d); \
|
|
} while(--n); \
|
|
\
|
|
h0 += b0; \
|
|
h1 += b1; \
|
|
} while(0)
|
|
|
|
u32 keyed_hash(const signed char *msg, int len)
|
|
{
|
|
u32 k[] = { 0x9464a485, 0x542e1a94, 0x3e846bff, 0xb75bcfc3 };
|
|
|
|
u32 h0 = k[0], h1 = k[1];
|
|
u32 a, b, c, d;
|
|
u32 pad;
|
|
int i;
|
|
|
|
pad = (u32) len | ((u32) len << 8);
|
|
pad |= pad << 16;
|
|
|
|
while (len >= 16) {
|
|
a = (u32) msg[0] |
|
|
(u32) msg[1] << 8 | (u32) msg[2] << 16 | (u32) msg[3] << 24;
|
|
b = (u32) msg[4] |
|
|
(u32) msg[5] << 8 | (u32) msg[6] << 16 | (u32) msg[7] << 24;
|
|
c = (u32) msg[8] |
|
|
(u32) msg[9] << 8 |
|
|
(u32) msg[10] << 16 | (u32) msg[11] << 24;
|
|
d = (u32) msg[12] |
|
|
(u32) msg[13] << 8 |
|
|
(u32) msg[14] << 16 | (u32) msg[15] << 24;
|
|
|
|
TEACORE(PARTROUNDS);
|
|
|
|
len -= 16;
|
|
msg += 16;
|
|
}
|
|
|
|
/* len <= 15 here: the while loop above consumed every full 16-byte
|
|
block, so the "len >= 16" test that used to sit here was dead. */
|
|
if (len >= 12) {
|
|
a = (u32) msg[0] |
|
|
(u32) msg[1] << 8 | (u32) msg[2] << 16 | (u32) msg[3] << 24;
|
|
b = (u32) msg[4] |
|
|
(u32) msg[5] << 8 | (u32) msg[6] << 16 | (u32) msg[7] << 24;
|
|
c = (u32) msg[8] |
|
|
(u32) msg[9] << 8 |
|
|
(u32) msg[10] << 16 | (u32) msg[11] << 24;
|
|
|
|
d = pad;
|
|
for (i = 12; i < len; i++) {
|
|
d <<= 8;
|
|
d |= msg[i];
|
|
}
|
|
} else if (len >= 8) {
|
|
a = (u32) msg[0] |
|
|
(u32) msg[1] << 8 | (u32) msg[2] << 16 | (u32) msg[3] << 24;
|
|
b = (u32) msg[4] |
|
|
(u32) msg[5] << 8 | (u32) msg[6] << 16 | (u32) msg[7] << 24;
|
|
|
|
c = d = pad;
|
|
for (i = 8; i < len; i++) {
|
|
c <<= 8;
|
|
c |= msg[i];
|
|
}
|
|
} else if (len >= 4) {
|
|
a = (u32) msg[0] |
|
|
(u32) msg[1] << 8 | (u32) msg[2] << 16 | (u32) msg[3] << 24;
|
|
|
|
b = c = d = pad;
|
|
for (i = 4; i < len; i++) {
|
|
b <<= 8;
|
|
b |= msg[i];
|
|
}
|
|
} else {
|
|
/* len <= 3 here. */
|
|
a = b = c = d = pad;
|
|
for (i = 0; i < len; i++) {
|
|
a <<= 8;
|
|
a |= msg[i];
|
|
}
|
|
}
|
|
|
|
TEACORE(FULLROUNDS);
|
|
|
|
return h0 ^ h1;
|
|
}
|
|
|
|
u32 yura_hash(const signed char *msg, int len)
|
|
{
|
|
int j, pow;
|
|
u32 a, c;
|
|
int i;
|
|
|
|
for (pow = 1, i = 1; i < len; i++)
|
|
pow = pow * 10;
|
|
|
|
if (len == 1)
|
|
a = msg[0] - 48;
|
|
else
|
|
a = (msg[0] - 48) * pow;
|
|
|
|
for (i = 1; i < len; i++) {
|
|
c = msg[i] - 48;
|
|
for (pow = 1, j = i; j < len - 1; j++)
|
|
pow = pow * 10;
|
|
a = a + c * pow;
|
|
}
|
|
|
|
for (; i < 40; i++) {
|
|
c = '0' - 48;
|
|
for (pow = 1, j = i; j < len - 1; j++)
|
|
pow = pow * 10;
|
|
a = a + c * pow;
|
|
}
|
|
|
|
for (; i < 256; i++) {
|
|
c = i;
|
|
for (pow = 1, j = i; j < len - 1; j++)
|
|
pow = pow * 10;
|
|
a = a + c * pow;
|
|
}
|
|
|
|
a = a << 7;
|
|
return a;
|
|
}
|
|
|
|
u32 r5_hash(const signed char *msg, int len)
|
|
{
|
|
u32 a = 0;
|
|
int i;
|
|
|
|
for (i = 0; i < len; i++) {
|
|
a += msg[i] << 4;
|
|
a += msg[i] >> 4;
|
|
a *= 11;
|
|
}
|
|
return a;
|
|
}
|