Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (19c75bcb) · Commits · 戴 / test

Pull crypto fixes from Herbert Xu: "This fixes the following issues: - a crash regression in the new skcipher walker - incorrect return value in public_key_verify_signature - fix for in-place signing in the sign-file utility" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: skcipher - fix crash in virtual walk sign-file: Fix inplace signing when src and dst names are both specified crypto: asymmetric_keys - set error code on failure

crypto/asymmetric_keys/public_key.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -121,6 +121,7 @@ int public_key_verify_signature(const struct public_key *pkey,
		if (ret)
		goto error_free_req;

		ret = -ENOMEM;
		outlen = crypto_akcipher_maxsize(tfm);
		output = kmalloc(outlen, GFP_KERNEL);
		if (!output)

crypto/skcipher.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -226,7 +226,9 @@ static int skcipher_next_slow(struct skcipher_walk *walk, unsigned int bsize)
		void *v;

		if (!phys) {
		buffer = walk->buffer ?: walk->page;
		if (!walk->buffer)
		walk->buffer = walk->page;
		buffer = walk->buffer;
		if (buffer)
		goto ok;
		}

scripts/sign-file.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -267,7 +267,7 @@ int main(int argc, char **argv)
		}
		x509_name = argv[2];
		module_name = argv[3];
		if (argc == 5) {
		if (argc == 5 && strcmp(argv[3], argv[4]) != 0) {
		dest_name = argv[4];
		replace_orig = false;
		} else {

Admin message