lkml.org 
[lkml]   [2016]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 06/94] crypto: s5p-sss - fix incorrect usage of scatterlists api
    3.2.82-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Marek Szyprowski <m.szyprowski@samsung.com>

    commit d1497977fecb9acce05988d6322ad415ef93bb39 upstream.

    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: a49e490c7a8a ("crypto: s5p-sss - add S5PV210 advanced crypto engine support")
    Fixes: 9e4a1100a445 ("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>
    [bwh: Backported to 3.2: unaligned DMA is unsupported so there is a different
    set of calls to replace]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    --- a/drivers/crypto/s5p-sss.c
    +++ b/drivers/crypto/s5p-sss.c
    @@ -210,11 +210,11 @@ static int s5p_set_outdata(struct s5p_ae
    {
    int err;

    - if (!IS_ALIGNED(sg_dma_len(sg), AES_BLOCK_SIZE)) {
    + if (!IS_ALIGNED(sg->length, AES_BLOCK_SIZE)) {
    err = -EINVAL;
    goto exit;
    }
    - if (!sg_dma_len(sg)) {
    + if (!sg->length) {
    err = -EINVAL;
    goto exit;
    }
    @@ -236,11 +236,11 @@ static int s5p_set_indata(struct s5p_aes
    {
    int err;

    - if (!IS_ALIGNED(sg_dma_len(sg), AES_BLOCK_SIZE)) {
    + if (!IS_ALIGNED(sg->length, AES_BLOCK_SIZE)) {
    err = -EINVAL;
    goto exit;
    }
    - if (!sg_dma_len(sg)) {
    + if (!sg->length) {
    err = -EINVAL;
    goto exit;
    }
    \
     
     \ /
      Last update: 2016-09-17 09:56    [W:3.364 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site