Build: add --enable-warnings (-Wall -Wextra); the tree is now warning-free with it, so distributions can opt in without risking a surprise -Werror breakage from a future compiler. Real bugs fixed (each verified by a reproducer): - lib/io.c: open_rollback_file() read 28 bytes into char[28] with no NUL and then strcmp()'d it against a 28-character magic, reading one byte past the array. The condition was also inverted, so a *valid* rollback file was rejected -- but only sometimes: the missing NUL made the result depend on stack garbage (verified: -O0 rejects, -O2 accepts). The whole --save-rollback/--rollback-changes path was unreliable. Now the buffer is sized for the terminator, zeroed, and the comparison is `!= 0`. Verified end to end: save -> reopen -> restore reports "2 blocks restored, 0 skipped"; a random file is rejected. - reiserfscore/reiserfslib.c, reiserfscore/journal.c: asprintf() was called with &fs->fs_file_name / &fs->fs_j_file_name, but those fields are `char *`, not `char **`. Passing a `char **` where `char *` is expected wrote through the wrong pointer -- silent memory corruption on any allocation. Fixed by using the new checked helper. - reiserfscore/node_formats.c: `code < 0` on an unsigned parameter was dead code; the guard never fired. - resize_reiserfs: missing `break` after -j made -j fall into -f, so "-j dev" silently also forced the operation. Sign-compare on the count_blocks() ternary and on count + blocks. - lib/misc.c: strncat with bound == strlen(src) (equivalent to strcat) into char[256] from a char[256] dirent name -- up to 261 bytes. Replaced with snprintf plus an explicit fit check. - lib/misc.c: die() used vsprintf into a fixed 1024-byte buffer. - strncpy with bound == destination size (mkreiserfs, tune, progbar) never terminated; replaced with snprintf. Allocator: drop the homegrown magic-header allocator. It wrote "_mem_begin_" / "mem_end" through strcpy inside the allocation, kept the size in an `int`, and its only safety check (checkmem) was never called -- every call site is commented out. Replaced with a size_t header that is over-aligned via max_align_t, so malloc alignment guarantees still hold. expandmem() now takes the old size from the header instead of a caller-supplied value that could disagree with it. Warnings: annotate the deliberate fallthroughs (fsck pass cascade, unit suffix parsing, percentage parsing), fix the remaining sign-compare and missing-field-initializer sites, and compute addresses of packed members via char* + offsetof instead of &member. Portability: asm/types.h -> linux/types.h, malloc.h and sys/vfs.h dropped from includes.h (nothing used them), sys/vfs.h -> sys/statfs.h for statfs(2). Version: reiserfsprogs.spec said 3.6.23 while configure.ac said 3.6.25. Remove the dead `#if 0` main() from hashes.c. Add .github/workflows/build.yml: gcc, clang, --enable-warnings and --enable-io-failure-emulation, each followed by a format/check/inspect smoke test on a real image. Verified: ./autogen.sh && ./configure --enable-warnings && make is clean from scratch (0 warnings, 51 compile/link steps). mkreiserfs, reiserfsck --check, debugreiserfs -S, reiserfstune -l and a real resize_reiserfs 128M -> 256M all succeed, and fsck reports the resized image clean.
193 lines
3.6 KiB
C
193 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;
|
|
}
|
|
|
|
if (len >= 12) {
|
|
if (len >= 16)
|
|
*(int *)0 = 0;
|
|
|
|
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) {
|
|
if (len >= 12)
|
|
*(int *)0 = 0;
|
|
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) {
|
|
if (len >= 8)
|
|
*(int *)0 = 0;
|
|
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 {
|
|
if (len >= 4)
|
|
*(int *)0 = 0;
|
|
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;
|
|
}
|