Skip to content

Commit

Permalink
crypto: marvell/octeontx - Fix a potential NULL dereference
Browse files Browse the repository at this point in the history
Smatch reports that:

    drivers/crypto/marvell/octeontx/otx_cptvf_algs.c:132 otx_cpt_aead_callback()
    warn: variable dereferenced before check 'cpt_info' (see line 121)

This function is called from process_pending_queue() as:

drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.c
   599                  /*
   600                   * Call callback after current pending entry has been
   601                   * processed, we don't do it if the callback pointer is
   602                   * invalid.
   603                   */
   604                  if (callback)
   605                          callback(res_code, areq, cpt_info);

It does appear to me that "cpt_info" can be NULL so this could lead to
a NULL dereference.

Fixes: 10b4f09 ("crypto: marvell - add the Virtual Function driver for CPT")
Signed-off-by: Dan Carpenter <[email protected]>
Signed-off-by: Herbert Xu <[email protected]>
  • Loading branch information
Dan Carpenter authored and herbertx committed Jun 15, 2020
1 parent 77251e4 commit 1f5b07f
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions drivers/crypto/marvell/octeontx/otx_cptvf_algs.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@ static void otx_cpt_aead_callback(int status, void *arg1, void *arg2)
struct otx_cpt_req_info *cpt_req;
struct pci_dev *pdev;

if (!cpt_info)
goto complete;

cpt_req = cpt_info->req;
if (!status) {
/*
Expand All @@ -129,10 +132,10 @@ static void otx_cpt_aead_callback(int status, void *arg1, void *arg2)
!cpt_req->is_enc)
status = validate_hmac_cipher_null(cpt_req);
}
if (cpt_info) {
pdev = cpt_info->pdev;
do_request_cleanup(pdev, cpt_info);
}
pdev = cpt_info->pdev;
do_request_cleanup(pdev, cpt_info);

complete:
if (areq)
areq->complete(areq, status);
}
Expand Down

0 comments on commit 1f5b07f

Please sign in to comment.