crypto: sahara - check return value of sg_nents_for_len
authorLABBE Corentin <clabbe.montjoie@gmail.com>
Wed, 4 Nov 2015 20:13:35 +0000 (21:13 +0100)
committerHerbert Xu <herbert@gondor.apana.org.au>
Tue, 17 Nov 2015 14:00:36 +0000 (22:00 +0800)
The sg_nents_for_len() function could fail, this patch add a check for
its return value.

Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/sahara.c

index f68c24a..ea9f56a 100644 (file)
@@ -477,7 +477,15 @@ static int sahara_hw_descriptor_create(struct sahara_dev *dev)
        }
 
        dev->nb_in_sg = sg_nents_for_len(dev->in_sg, dev->total);
+       if (dev->nb_in_sg < 0) {
+               dev_err(dev->device, "Invalid numbers of src SG.\n");
+               return dev->nb_in_sg;
+       }
        dev->nb_out_sg = sg_nents_for_len(dev->out_sg, dev->total);
+       if (dev->nb_out_sg < 0) {
+               dev_err(dev->device, "Invalid numbers of dst SG.\n");
+               return dev->nb_out_sg;
+       }
        if ((dev->nb_in_sg + dev->nb_out_sg) > SAHARA_MAX_HW_LINK) {
                dev_err(dev->device, "not enough hw links (%d)\n",
                        dev->nb_in_sg + dev->nb_out_sg);
@@ -793,6 +801,10 @@ static int sahara_sha_hw_links_create(struct sahara_dev *dev,
        dev->in_sg = rctx->in_sg;
 
        dev->nb_in_sg = sg_nents_for_len(dev->in_sg, rctx->total);
+       if (dev->nb_in_sg < 0) {
+               dev_err(dev->device, "Invalid numbers of src SG.\n");
+               return dev->nb_in_sg;
+       }
        if ((dev->nb_in_sg) > SAHARA_MAX_HW_LINK) {
                dev_err(dev->device, "not enough hw links (%d)\n",
                        dev->nb_in_sg + dev->nb_out_sg);