lkml.org 
[lkml]   [2016]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 09/16] crypto: nx - off by one bug in nx_of_update_msc()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    commit e514cc0a492a3f39ef71b31590a7ef67537ee04b upstream.

    The props->ap[] array is defined like this:

    struct alg_props ap[NX_MAX_FC][NX_MAX_MODE][3];

    So we can see that if msc->fc and msc->mode are == to NX_MAX_FC or
    NX_MAX_MODE then we're off by one.

    Fixes: ae0222b7289d ('powerpc/crypto: nx driver code supporting nx encryption')
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Willy Tarreau <w@1wt.eu>
    ---
    drivers/crypto/nx/nx.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/crypto/nx/nx.c b/drivers/crypto/nx/nx.c
    index bbdab6e..fe68964 100644
    --- a/drivers/crypto/nx/nx.c
    +++ b/drivers/crypto/nx/nx.c
    @@ -309,7 +309,7 @@ static void nx_of_update_msc(struct device *dev,
    ((bytes_so_far + sizeof(struct msc_triplet)) <= lenp) &&
    i < msc->triplets;
    i++) {
    - if (msc->fc > NX_MAX_FC || msc->mode > NX_MAX_MODE) {
    + if (msc->fc >= NX_MAX_FC || msc->mode >= NX_MAX_MODE) {
    dev_err(dev, "unknown function code/mode "
    "combo: %d/%d (ignored)\n", msc->fc,
    msc->mode);
    --
    2.8.0.rc2.1.gbe9624a
    \
     
     \ /
      Last update: 2016-10-20 00:52    [W:0.020 / U:28.768 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site