projects/linux·commit f8a4eba3

Merge tag 'crc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux

f8a4eba3 · Linus Torvalds <[email protected]> · 2025-03-28 12:41:36 -07:00

Pull CRC fixes from Eric Biggers:
 "Fix out-of-scope array bugs in arm and arm64's crc_t10dif_arch()"

* tag 'crc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux:
  arm64/crc-t10dif: fix use of out-of-scope array in crc_t10dif_arch()
  arm/crc-t10dif: fix use of out-of-scope array in crc_t10dif_arch()
Commit
f8a4eba343cafc7e9ec11e45f53eddb88f90e397
Parents
72885116 · d48b663f

Merge commit. Changes below are compared with the first parent: 72885116.

Changes

2 files changed · +2 −6

FileStatusAddDelContent
arch/arm/lib/crc-t10dif-glue.cmodified+1−3View file
arch/arm64/lib/crc-t10dif-glue.cmodified+1−3View file

arch/arm/lib/crc-t10dif-glue.c

View file
diff --git a/arch/arm/lib/crc-t10dif-glue.c b/arch/arm/lib/crc-t10dif-glue.c
index f3584ba..6efad3d 100644
--- a/arch/arm/lib/crc-t10dif-glue.c
+++ b/arch/arm/lib/crc-t10dif-glue.c
@@ -44,9 +44,7 @@ u16 crc_t10dif_arch(u16 crc, const u8 *data, size_t length)
crc_t10dif_pmull8(crc, data, length, buf);
kernel_neon_end();
- crc = 0;
- data = buf;
- length = sizeof(buf);
+ return crc_t10dif_generic(0, buf, sizeof(buf));
}
}
return crc_t10dif_generic(crc, data, length);

arch/arm64/lib/crc-t10dif-glue.c

View file
diff --git a/arch/arm64/lib/crc-t10dif-glue.c b/arch/arm64/lib/crc-t10dif-glue.c
index a007d0c..bacd18f 100644
--- a/arch/arm64/lib/crc-t10dif-glue.c
+++ b/arch/arm64/lib/crc-t10dif-glue.c
@@ -45,9 +45,7 @@ u16 crc_t10dif_arch(u16 crc, const u8 *data, size_t length)
crc_t10dif_pmull_p8(crc, data, length, buf);
kernel_neon_end();
- crc = 0;
- data = buf;
- length = sizeof(buf);
+ return crc_t10dif_generic(0, buf, sizeof(buf));
}
}
return crc_t10dif_generic(crc, data, length);