Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ddfdd42 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fixes from Herbert Xu:
 "This fixes a regression in RSA that was only half-fixed earlier in the
  cycle.  It also fixes an older regression that breaks the keyring
  subsystem"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: rsa-pkcs1pad - Handle leading zero for decryption
  KEYS: Fix skcipher IV clobbering
parents 7d188bad 0cf43f50

crypto/rsa-pkcs1pad.c

+24 −17
Original line number Diff line number Diff line
@@ -298,41 +298,48 @@ static int pkcs1pad_decrypt_complete(struct akcipher_request *req, int err) 
	struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req);

	struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm);

	struct pkcs1pad_request *req_ctx = akcipher_request_ctx(req);

	unsigned int dst_len;

	unsigned int pos;



	if (err == -EOVERFLOW)

		/* Decrypted value had no leading 0 byte */

		err = -EINVAL;

	u8 *out_buf;



	if (err)

		goto done;



	if (req_ctx->child_req.dst_len != ctx->key_size - 1) {

	err = -EINVAL;

	dst_len = req_ctx->child_req.dst_len;

	if (dst_len < ctx->key_size - 1)

		goto done;

	}



	if (req_ctx->out_buf[0] != 0x02) {

		err = -EINVAL;

	out_buf = req_ctx->out_buf;

	if (dst_len == ctx->key_size) {

		if (out_buf[0] != 0x00)

			/* Decrypted value had no leading 0 byte */

			goto done;



		dst_len--;

		out_buf++;

	}

	for (pos = 1; pos < req_ctx->child_req.dst_len; pos++)

		if (req_ctx->out_buf[pos] == 0x00)



	if (out_buf[0] != 0x02)

		goto done;



	for (pos = 1; pos < dst_len; pos++)

		if (out_buf[pos] == 0x00)

			break;

	if (pos < 9 || pos == req_ctx->child_req.dst_len) {

		err = -EINVAL;

	if (pos < 9 || pos == dst_len)

		goto done;

	}

	pos++;



	if (req->dst_len < req_ctx->child_req.dst_len - pos)

	err = 0;



	if (req->dst_len < dst_len - pos)

		err = -EOVERFLOW;

	req->dst_len = req_ctx->child_req.dst_len - pos;

	req->dst_len = dst_len - pos;



	if (!err)

		sg_copy_from_buffer(req->dst,

				sg_nents_for_len(req->dst, req->dst_len),

				req_ctx->out_buf + pos, req->dst_len);

				out_buf + pos, req->dst_len);



done:

	kzfree(req_ctx->out_buf);

security/keys/encrypted-keys/encrypted.c

+7 −4
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/rcupdate.h>

#include <linux/scatterlist.h>

#include <linux/ctype.h>

#include <crypto/aes.h>

#include <crypto/hash.h>

#include <crypto/sha.h>

#include <crypto/skcipher.h>
@@ -478,6 +479,7 @@ static int derived_key_encrypt(struct encrypted_key_payload *epayload, 
	struct crypto_skcipher *tfm;

	struct skcipher_request *req;

	unsigned int encrypted_datalen;

	u8 iv[AES_BLOCK_SIZE];

	unsigned int padlen;

	char pad[16];

	int ret;
@@ -500,8 +502,8 @@ static int derived_key_encrypt(struct encrypted_key_payload *epayload, 
	sg_init_table(sg_out, 1);

	sg_set_buf(sg_out, epayload->encrypted_data, encrypted_datalen);



	skcipher_request_set_crypt(req, sg_in, sg_out, encrypted_datalen,

				   epayload->iv);

	memcpy(iv, epayload->iv, sizeof(iv));

	skcipher_request_set_crypt(req, sg_in, sg_out, encrypted_datalen, iv);

	ret = crypto_skcipher_encrypt(req);

	tfm = crypto_skcipher_reqtfm(req);

	skcipher_request_free(req);
@@ -581,6 +583,7 @@ static int derived_key_decrypt(struct encrypted_key_payload *epayload, 
	struct crypto_skcipher *tfm;

	struct skcipher_request *req;

	unsigned int encrypted_datalen;

	u8 iv[AES_BLOCK_SIZE];

	char pad[16];

	int ret;
@@ -599,8 +602,8 @@ static int derived_key_decrypt(struct encrypted_key_payload *epayload, 
		   epayload->decrypted_datalen);

	sg_set_buf(&sg_out[1], pad, sizeof pad);



	skcipher_request_set_crypt(req, sg_in, sg_out, encrypted_datalen,

				   epayload->iv);

	memcpy(iv, epayload->iv, sizeof(iv));

	skcipher_request_set_crypt(req, sg_in, sg_out, encrypted_datalen, iv);

	ret = crypto_skcipher_decrypt(req);

	tfm = crypto_skcipher_reqtfm(req);

	skcipher_request_free(req);