Commit d1497977 authored Apr 26, 2016 by Marek Szyprowski Committed by Herbert Xu Apr 28, 2016

crypto: s5p-sss - fix incorrect usage of scatterlists api



sg_dma_len() macro can be used only on scattelists which are mapped, so
all calls to it before dma_map_sg() are invalid. Replace them by proper
check for direct sg segment length read.

Fixes: a49e490c ("crypto: s5p-sss - add S5PV210 advanced crypto engine support")
Fixes: 9e4a1100 ("crypto: s5p-sss - Handle unaligned buffers")
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: Vladimir Zapolskiy <vz@mleia.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent 6f643897

drivers/crypto/s5p-sss.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -327,7 +327,7 @@ static int s5p_set_outdata(struct s5p_aes_dev dev, struct scatterlist sg)
		{
		int err;

		if (!sg_dma_len(sg)) {
		if (!sg->length) {
		err = -EINVAL;
		goto exit;
		}
		@@ -349,7 +349,7 @@ static int s5p_set_indata(struct s5p_aes_dev dev, struct scatterlist sg)
		{
		int err;

		if (!sg_dma_len(sg)) {
		if (!sg->length) {
		err = -EINVAL;
		goto exit;
		}
		@@ -474,7 +474,7 @@ static void s5p_set_aes(struct s5p_aes_dev *dev,
		static bool s5p_is_sg_aligned(struct scatterlist *sg)
		{
		while (sg) {
		if (!IS_ALIGNED(sg_dma_len(sg), AES_BLOCK_SIZE))
		if (!IS_ALIGNED(sg->length, AES_BLOCK_SIZE))
		return false;
		sg = sg_next(sg);
		}

Admin message