2020-04-17 07:47:28

by Sedat Dilek

Subject: [PATCH wireless-drivers v3] iwlwifi: actually check allocated conf_tlv pointer

From: Chris Rorvick <[email protected]>

Commit 71bc0334a637 ("iwlwifi: check allocated pointer when allocating
conf_tlvs") attempted to fix a typoe introduced by commit 17b809c9b22e
("iwlwifi: dbg: move debug data to a struct") but does not implement the
check correctly.

Fixes: 71bc0334a637 ("iwlwifi: check allocated pointer when allocating conf_tlvs")
Tweeted-by: @grsecurity
Message-Id: <[email protected]>
Signed-off-by: Chris Rorvick <[email protected]>
Signed-off-by: Sedat Dilek <[email protected]>
---
Changes v1->v2:
- Fix typo s/fw.dbg_conf_tlv/fw.dbg.conf_tlv
- Add Fixes tag as suggested by Kalle
- v2 on top of wireless-drivers.git as suggested by Kalle
Changes v2->v3:
- Add Changelog

drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index ff52e69c1c80..eeb750bdbda1 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -1467,7 +1467,7 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
kmemdup(pieces->dbg_conf_tlv[i],
pieces->dbg_conf_tlv_len[i],
GFP_KERNEL);
- if (!pieces->dbg_conf_tlv[i])
+ if (!drv->fw.dbg.conf_tlv[i])
goto out_free_fw;
}
}
--
2.26.1

2020-04-17 08:05:28

by Kalle Valo

Subject: Re: [PATCH wireless-drivers v3] iwlwifi: actually check allocated conf_tlv pointer

Sedat Dilek <[email protected]> writes:

> From: Chris Rorvick <[email protected]>
>
> Commit 71bc0334a637 ("iwlwifi: check allocated pointer when allocating
> conf_tlvs") attempted to fix a typoe introduced by commit 17b809c9b22e
> ("iwlwifi: dbg: move debug data to a struct") but does not implement the
> check correctly.
>
> Fixes: 71bc0334a637 ("iwlwifi: check allocated pointer when allocating conf_tlvs")
> Tweeted-by: @grsecurity
> Message-Id: <[email protected]>
> Signed-off-by: Chris Rorvick <[email protected]>
> Signed-off-by: Sedat Dilek <[email protected]>

Thanks, looks good to me. I'll just remove the Message-Id tag, it's not
really needed in this case.

--
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

2020-04-17 08:07:26

by Sedat Dilek

Subject: Re: [PATCH wireless-drivers v3] iwlwifi: actually check allocated conf_tlv pointer

On Fri, Apr 17, 2020 at 10:03 AM Kalle Valo <[email protected]> wrote:
>
> Sedat Dilek <[email protected]> writes:
>
> > From: Chris Rorvick <[email protected]>
> >
> > Commit 71bc0334a637 ("iwlwifi: check allocated pointer when allocating
> > conf_tlvs") attempted to fix a typoe introduced by commit 17b809c9b22e
> > ("iwlwifi: dbg: move debug data to a struct") but does not implement the
> > check correctly.
> >
> > Fixes: 71bc0334a637 ("iwlwifi: check allocated pointer when allocating conf_tlvs")
> > Tweeted-by: @grsecurity
> > Message-Id: <[email protected]>
> > Signed-off-by: Chris Rorvick <[email protected]>
> > Signed-off-by: Sedat Dilek <[email protected]>
>
> Thanks, looks good to me. I'll just remove the Message-Id tag, it's not
> really needed in this case.
>

Thanks for all your suggestions and taking care, Kalle.

- Sedat -

> --
> https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

2020-04-21 07:53:37

by Kalle Valo

Subject: Re: [PATCH wireless-drivers v3] iwlwifi: actually check allocated conf_tlv pointer

Sedat Dilek <[email protected]> wrote:

> From: Chris Rorvick <[email protected]>
>
> Commit 71bc0334a637 ("iwlwifi: check allocated pointer when allocating
> conf_tlvs") attempted to fix a typoe introduced by commit 17b809c9b22e
> ("iwlwifi: dbg: move debug data to a struct") but does not implement the
> check correctly.
>
> Fixes: 71bc0334a637 ("iwlwifi: check allocated pointer when allocating conf_tlvs")
> Tweeted-by: @grsecurity
> Signed-off-by: Chris Rorvick <[email protected]>
> Signed-off-by: Sedat Dilek <[email protected]>

Patch applied to wireless-drivers.git, thanks.

a176e114ace4 iwlwifi: actually check allocated conf_tlv pointer

--
https://patchwork.kernel.org/patch/11494331/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches