Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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 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
+10
-2
+5
-1
crypto/lrw.c
+5
-1
crypto/lrw.c
···
212
212
{
213
213
struct skcipher_request *req = areq->data;
214
214
215
-
if (!err)
215
+
if (!err) {
216
+
struct rctx *rctx = skcipher_request_ctx(req);
217
+
218
+
rctx->subreq.base.flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
216
219
err = xor_tweak_post(req);
220
+
}
217
221
218
222
skcipher_request_complete(req, err);
219
223
}
+5
-1
crypto/xts.c
+5
-1
crypto/xts.c
···
137
137
{
138
138
struct skcipher_request *req = areq->data;
139
139
140
-
if (!err)
140
+
if (!err) {
141
+
struct rctx *rctx = skcipher_request_ctx(req);
142
+
143
+
rctx->subreq.base.flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
141
144
err = xor_tweak_post(req);
145
+
}
142
146
143
147
skcipher_request_complete(req, err);
144
148
}