projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a38a510)
ipw2x00: Fix potential NULL dereference in libipw_xmit()
authorHaowen Bai <baihaowen@meizu.com>
Fri, 1 Apr 2022 07:10:54 +0000 (15:10 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 14 Jun 2022 14:53:44 +0000 (16:53 +0200)
[ Upstream commit e8366bbabe1d207cf7c5b11ae50e223ae6fc278b ]

crypt and crypt->ops could be null, so we need to checking null
before dereference

Signed-off-by: Haowen Bai <baihaowen@meizu.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/1648797055-25730-1-git-send-email-baihaowen@meizu.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/intel/ipw2x00/libipw_tx.c patch | blob | blame | history

diff --git a/drivers/net/wireless/intel/ipw2x00/libipw_tx.c b/drivers/net/wireless/intel/ipw2x00/libipw_tx.c
index 84205aa508dfdcb95122bf7487143b6585f5d00e..daa4f9eb08fff6fb75cd99da586db74ea1992e34 100644 (file)
--- a/drivers/net/wireless/intel/ipw2x00/libipw_tx.c
+++ b/drivers/net/wireless/intel/ipw2x00/libipw_tx.c
@@ -397,7 +397,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;