[PATCH] ipw2x00: Fix potential NULL dereference in libipw_xmit()

Haowen Bai posted 1 patch 4 years, 2 months ago
drivers/net/wireless/intel/ipw2x00/libipw_tx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] ipw2x00: Fix potential NULL dereference in libipw_xmit()
Posted by Haowen Bai 4 years, 2 months ago
crypt and crypt->ops could be null, so we need to checking null
before dereference

Signed-off-by: Haowen Bai <baihaowen@meizu.com>
---
 drivers/net/wireless/intel/ipw2x00/libipw_tx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/intel/ipw2x00/libipw_tx.c b/drivers/net/wireless/intel/ipw2x00/libipw_tx.c
index 36d1e6b2568d..4aec1fce1ae2 100644
--- a/drivers/net/wireless/intel/ipw2x00/libipw_tx.c
+++ b/drivers/net/wireless/intel/ipw2x00/libipw_tx.c
@@ -383,7 +383,7 @@ netdev_tx_t libipw_xmit(struct sk_buff *skb, struct net_device *dev)
 
 		/* Each fragment may need to have room for encryption
 		 * pre/postfix */
-		if (host_encrypt)
+		if (host_encrypt && crypt && crypt->ops)
 			bytes_per_frag -= crypt->ops->extra_mpdu_prefix_len +
 			    crypt->ops->extra_mpdu_postfix_len;
 
-- 
2.7.4
Re: [PATCH] ipw2x00: Fix potential NULL dereference in libipw_xmit()
Posted by Kalle Valo 4 years, 2 months ago
Haowen Bai <baihaowen@meizu.com> wrote:

> crypt and crypt->ops could be null, so we need to checking null
> before dereference
> 
> Signed-off-by: Haowen Bai <baihaowen@meizu.com>

Patch applied to wireless-next.git, thanks.

e8366bbabe1d ipw2x00: Fix potential NULL dereference in libipw_xmit()

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/1648797055-25730-1-git-send-email-baihaowen@meizu.com/

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