linux-stable.git/crypto/algif_skcipher.c, branch linux-4.1.y

crypto: algif_skcipher - only call put_page on referenced and used pages

2017-10-04T01:36:43+00:00

[ Upstream commit 445a582738de6802669aeed9c33ca406c23c3b1f ]

For asynchronous operation, SGs are allocated without a page mapped to
them or with a page that is not used (ref-counted). If the SGL is freed,
the code must only call put_page for an SG if there was a page assigned
and ref-counted in the first place.

This fixes a kernel crash when using io_submit with more than one iocb
using the sendmsg and sendpage (vmsplice/splice) interface.

Cc: 
Signed-off-by: Stephan Mueller 
Signed-off-by: Herbert Xu 
Signed-off-by: Sasha Levin

Backport fix for crypto: algif_skcipher - Fix race condition in skcipher_check_key

2016-02-28T05:09:45+00:00

commit 1822793a523e5d5730b19cc21160ff1717421bc8 upstream.

We need to lock the child socket in skcipher_check_key as otherwise
two simultaneous calls can cause the parent socket to be freed.

Cc: stable@vger.kernel.org
Signed-off-by: Herbert Xu 
Signed-off-by: Sasha Levin

Backport fix for crypto: algif_skcipher - Remove custom release parent function

2016-02-28T05:09:45+00:00

commit d7b65aee1e7b4c87922b0232eaba56a8a143a4a0 upstream.

This patch removes the custom release parent function as the
generic af_alg_release_parent now works for nokey sockets too.

Cc: stable@vger.kernel.org
Signed-off-by: Herbert Xu 
Signed-off-by: Sasha Levin

Backport fix for crypto: algif_skcipher - Add nokey compatibility path

2016-02-28T05:09:44+00:00

commit a0fa2d037129a9849918a92d91b79ed6c7bd2818 upstream.

This patch adds a compatibility path to support old applications
that do acept(2) before setkey.

Cc: stable@vger.kernel.org
Signed-off-by: Herbert Xu 
Signed-off-by: Sasha Levin

Backport fix for crypto: algif_skcipher - Require setkey before accept(2)

2016-02-28T05:09:44+00:00

commit dd504589577d8e8e70f51f997ad487a4cb6c026f upstream.

Some cipher implementations will crash if you try to use them
without calling setkey first.  This patch adds a check so that
the accept(2) call will fail with -ENOKEY if setkey hasn't been
done on the socket yet.

Cc: stable@vger.kernel.org
Reported-by: Dmitry Vyukov 
Signed-off-by: Herbert Xu 
Tested-by: Dmitry Vyukov 
[backported to 4.1 by Milan Broz ]

Signed-off-by: Sasha Levin

crypto: algif_skcipher - sendmsg SG marking is off by one

2016-02-03T21:23:21+00:00

[ Upstream commit 202736d99b7f29279db9da61587f11a08a04a9c6 ]

We mark the end of the SG list in sendmsg and sendpage and unmark
it on the next send call.  Unfortunately the unmarking in sendmsg
is off-by-one, leading to an SG list that is too short.

Fixes: 0f477b655a52 ("crypto: algif - Mark sgl end at the end of data")
Cc: stable@vger.kernel.org
Signed-off-by: Herbert Xu 
Signed-off-by: Sasha Levin

new helper: msg_data_left()

2015-04-11T19:53:35+00:00

convert open-coded instances

Signed-off-by: Al Viro

Merge branch 'iocb' into for-davem

2015-04-09T04:01:38+00:00

trivial conflict in net/socket.c and non-trivial one in crypto -
that one had evaded aio_complete() removal.

Signed-off-by: Al Viro

crypto: algif - explicitly mark end of data

2015-04-02T02:59:28+00:00

After the TX sgl is expanded we need to explicitly mark end of data
at the last buffer that contains data.

Changes in v2
 - use type 'bool' and true/false for 'mark'.

Signed-off-by: Tadeusz Struk 
Signed-off-by: David S. Miller

crypto: algif - use kmalloc instead of kzalloc

2015-04-01T19:32:35+00:00

No need to use kzalloc to allocate sgls as the structure is initialized anyway.

Signed-off-by: Tadeusz Struk 
Signed-off-by: David S. Miller