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

Pull crypto fixes from Herbert Xu: "This fixes a bug in xts and lrw where they may sleep in an atomic context" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: lrw - Fix atomic sleep when walking skcipher crypto: xts - Fix atomic sleep when walking skcipher

crypto/lrw.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -212,8 +212,12 @@ static void crypt_done(struct crypto_async_request *areq, int err)
		{
		struct skcipher_request *req = areq->data;

		if (!err)
		if (!err) {
		struct rctx *rctx = skcipher_request_ctx(req);

		rctx->subreq.base.flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
		err = xor_tweak_post(req);
		}

		skcipher_request_complete(req, err);
		}

crypto/xts.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -137,8 +137,12 @@ static void crypt_done(struct crypto_async_request *areq, int err)
		{
		struct skcipher_request *req = areq->data;

		if (!err)
		if (!err) {
		struct rctx *rctx = skcipher_request_ctx(req);

		rctx->subreq.base.flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
		err = xor_tweak_post(req);
		}

		skcipher_request_complete(req, err);
		}

Admin message