Merge tag 'v6.12-p5' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

torvalds · torvalds · commit 842c7e5834af · 2024-11-15T10:04:39.000-08:00
Pull crypto fix from Herbert Xu:
 "Fix a regression in the MIPS CRC32C code"

* tag 'v6.12-p5' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: mips/crc32 - fix the CRC32C implementation
diff --git a/arch/mips/crypto/crc32-mips.c b/arch/mips/crypto/crc32-mips.c
@@ -123,20 +123,20 @@ static u32 crc32c_mips_le_hw(u32 crc_, const u8 *p, unsigned int len)
 		for (; len >= sizeof(u64); p += sizeof(u64), len -= sizeof(u64)) {
 			u64 value = get_unaligned_le64(p);
 
-			CRC32(crc, value, d);
+			CRC32C(crc, value, d);
 		}
 
 		if (len & sizeof(u32)) {
 			u32 value = get_unaligned_le32(p);
 
-			CRC32(crc, value, w);
+			CRC32C(crc, value, w);
 			p += sizeof(u32);
 		}
 	} else {
 		for (; len >= sizeof(u32); len -= sizeof(u32)) {
 			u32 value = get_unaligned_le32(p);
 
-			CRC32(crc, value, w);
+			CRC32C(crc, value, w);
 			p += sizeof(u32);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -123,20 +123,20 @@ static u32 crc32c_mips_le_hw(u32 crc_, const u8 *p, unsigned int len)`
`123`	`123`	`for (; len >= sizeof(u64); p += sizeof(u64), len -= sizeof(u64)) {`
`124`	`124`	`u64 value = get_unaligned_le64(p);`
`125`	`125`
`126`		`- CRC32(crc, value, d);`
	`126`	`+ CRC32C(crc, value, d);`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`if (len & sizeof(u32)) {`
`130`	`130`	`u32 value = get_unaligned_le32(p);`
`131`	`131`
`132`		`- CRC32(crc, value, w);`
	`132`	`+ CRC32C(crc, value, w);`
`133`	`133`	`p += sizeof(u32);`
`134`	`134`	`}`
`135`	`135`	`} else {`
`136`	`136`	`for (; len >= sizeof(u32); len -= sizeof(u32)) {`
`137`	`137`	`u32 value = get_unaligned_le32(p);`
`138`	`138`
`139`		`- CRC32(crc, value, w);`
	`139`	`+ CRC32C(crc, value, w);`
`140`	`140`	`p += sizeof(u32);`
`141`	`141`	`}`
`142`	`142`	`}`