| From 4afc781333869375c9b938df1f22a700a2bede5e Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 1 Apr 2022 15:10:54 +0800 |
| Subject: ipw2x00: Fix potential NULL dereference in libipw_xmit() |
| |
| From: Haowen Bai <baihaowen@meizu.com> |
| |
| [ 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 | 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 e8c039879b05..cb30b3b63635 100644 |
| --- 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; |
| |
| -- |
| 2.35.1 |
| |
