From: Herbert Xu <herbert@gondor.apana.org.au>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Boris Brezillon <bbrezillon@kernel.org>,
Arnaud Ebalard <arno@natisbad.org>,
Srujana Challa <schalla@marvell.com>,
"David S. Miller" <davem@davemloft.net>,
Wolfram Sang <wsa+renesas@sang-engineering.com>,
Giovanni Cabiddu <giovanni.cabiddu@intel.com>,
Lukasz Bartosik <lbartosik@marvell.com>,
linux-crypto@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] crypto: marvell/octeontx - prevent integer overflows
Date: Thu, 8 Sep 2022 17:34:42 +0800 [thread overview]
Message-ID: <Yxm3MuG+2hMdJSGB@gondor.apana.org.au> (raw)
In-Reply-To: <YxDQeeqY6u5EBn5H@kili>
On Thu, Sep 01, 2022 at 06:32:09PM +0300, Dan Carpenter wrote:
>
> @@ -303,7 +304,13 @@ static int process_tar_file(struct device *dev,
> if (get_ucode_type(ucode_hdr, &ucode_type))
> return 0;
>
> - ucode_size = ntohl(ucode_hdr->code_length) * 2;
> + code_length = ntohl(ucode_hdr->code_length);
> + if (code_length >= INT_MAX / 2) {
> + dev_err(dev, "Invalid code_length %u\n", code_length);
> + return -EINVAL;
> + }
> +
> + ucode_size = code_length * 2;
> if (!ucode_size || (size < round_up(ucode_size, 16) +
> sizeof(struct otx_cpt_ucode_hdr) + OTX_CPT_UCODE_SIGN_LEN)) {
> dev_err(dev, "Ucode %s invalid size\n", filename);
How come you didn't add a "ucode_size > size" check like you did
below?
> @@ -896,9 +904,16 @@ static int ucode_load(struct device *dev, struct otx_cpt_ucode *ucode,
> ucode_hdr = (struct otx_cpt_ucode_hdr *) fw->data;
> memcpy(ucode->ver_str, ucode_hdr->ver_str, OTX_CPT_UCODE_VER_STR_SZ);
> ucode->ver_num = ucode_hdr->ver_num;
> - ucode->size = ntohl(ucode_hdr->code_length) * 2;
> - if (!ucode->size || (fw->size < round_up(ucode->size, 16)
> - + sizeof(struct otx_cpt_ucode_hdr) + OTX_CPT_UCODE_SIGN_LEN)) {
> + code_length = ntohl(ucode_hdr->code_length);
> + if (code_length >= INT_MAX / 2) {
> + ret = -EINVAL;
> + goto release_fw;
> + }
> + ucode->size = code_length * 2;
> + if (!ucode->size ||
> + ucode->size > fw->size ||
> + (fw->size < round_up(ucode->size, 16) +
> + sizeof(struct otx_cpt_ucode_hdr) + OTX_CPT_UCODE_SIGN_LEN)) {
> dev_err(dev, "Ucode %s invalid size\n", ucode_filename);
> ret = -EINVAL;
> goto release_fw;
> --
> 2.35.1
Thanks,
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
next prev parent reply other threads:[~2022-09-08 9:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-01 15:32 [PATCH] crypto: marvell/octeontx - prevent integer overflows Dan Carpenter
2022-09-08 9:34 ` Herbert Xu [this message]
2022-09-15 13:54 ` Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Yxm3MuG+2hMdJSGB@gondor.apana.org.au \
--to=herbert@gondor.apana.org.au \
--cc=arno@natisbad.org \
--cc=bbrezillon@kernel.org \
--cc=dan.carpenter@oracle.com \
--cc=davem@davemloft.net \
--cc=giovanni.cabiddu@intel.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=lbartosik@marvell.com \
--cc=linux-crypto@vger.kernel.org \
--cc=schalla@marvell.com \
--cc=wsa+renesas@sang-engineering.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.