Commit f8a4eba3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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()
parents 72885116 d48b663f

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

+1 −3
Original line number Diff line number Diff line
@@ -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

+1 −3
Original line number Diff line number Diff line
@@ -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);