Message ID | 20230710013907.43770-1-jiasheng@iscas.ac.cn (mailing list archive) |
---|---|
State | Accepted |
Commit | 87355b7c3da9bfd81935caba0ab763355147f7b0 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | net: dsa: qca8k: Add check for skb_copy | expand |
On Mon, Jul 10, 2023 at 7:09 AM Jiasheng Jiang <jiasheng@iscas.ac.cn> wrote: > > Add check for the return value of skb_copy in order to avoid NULL pointer > dereference. > > Fixes: 2cd548566384 ("net: dsa: qca8k: add support for phy read/write with mgmt Ethernet") > Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> > --- > drivers/net/dsa/qca/qca8k-8xxx.c | 3 +++ > 1 file changed, 3 insertions(+) > Looks good to me. Reviewed-by: Pavan Chebbi <pavan.chebbi@broadcom.com> > diff --git a/drivers/net/dsa/qca/qca8k-8xxx.c b/drivers/net/dsa/qca/qca8k-8xxx.c > index f7d7cfb2fd86..09b80644c11b 100644 > --- a/drivers/net/dsa/qca/qca8k-8xxx.c > +++ b/drivers/net/dsa/qca/qca8k-8xxx.c > @@ -588,6 +588,9 @@ qca8k_phy_eth_busy_wait(struct qca8k_mgmt_eth_data *mgmt_eth_data, > bool ack; > int ret; > > + if (!skb) > + return -ENOMEM; > + > reinit_completion(&mgmt_eth_data->rw_done); > > /* Increment seq_num and set it in the copy pkt */ > -- > 2.25.1 > >
Hello: This patch was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: On Mon, 10 Jul 2023 09:39:07 +0800 you wrote: > Add check for the return value of skb_copy in order to avoid NULL pointer > dereference. > > Fixes: 2cd548566384 ("net: dsa: qca8k: add support for phy read/write with mgmt Ethernet") > Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> > --- > drivers/net/dsa/qca/qca8k-8xxx.c | 3 +++ > 1 file changed, 3 insertions(+) Here is the summary with links: - net: dsa: qca8k: Add check for skb_copy https://git.kernel.org/netdev/net/c/87355b7c3da9 You are awesome, thank you!
diff --git a/drivers/net/dsa/qca/qca8k-8xxx.c b/drivers/net/dsa/qca/qca8k-8xxx.c index f7d7cfb2fd86..09b80644c11b 100644 --- a/drivers/net/dsa/qca/qca8k-8xxx.c +++ b/drivers/net/dsa/qca/qca8k-8xxx.c @@ -588,6 +588,9 @@ qca8k_phy_eth_busy_wait(struct qca8k_mgmt_eth_data *mgmt_eth_data, bool ack; int ret; + if (!skb) + return -ENOMEM; + reinit_completion(&mgmt_eth_data->rw_done); /* Increment seq_num and set it in the copy pkt */
Add check for the return value of skb_copy in order to avoid NULL pointer dereference. Fixes: 2cd548566384 ("net: dsa: qca8k: add support for phy read/write with mgmt Ethernet") Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> --- drivers/net/dsa/qca/qca8k-8xxx.c | 3 +++ 1 file changed, 3 insertions(+)