From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8249C433F5 for ; Mon, 30 May 2022 14:21:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237516AbiE3OVm (ORCPT ); Mon, 30 May 2022 10:21:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241441AbiE3ORg (ORCPT ); Mon, 30 May 2022 10:17:36 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B54D952509; Mon, 30 May 2022 06:47:15 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 51CA460EC3; Mon, 30 May 2022 13:47:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 775CBC36AE9; Mon, 30 May 2022 13:47:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653918434; bh=0jYq7SrEBjoFSLyblsX/VqNdX518v94WFZHXPitwbSk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CJR6TBNYvpKHjxlY4XljV7QautpfUujY1kmQkkJPwDuNDEtMQqCPOQLSBCpZhJpsh 5Xx6JjaAy2m98teCivqkwZGEtA4DXbnFdhcR/4iWkxJToRBzD5EUZywTpOi+q3B887 H0Kl1CxaKhehYLPwYZwoR20RZG5Pw16CRD+qtgJKAs6V1GfojzZhSh5Hw3i7VbkjUZ WtTdkiDyUdMgWg6jVd4FbYew8DAxMyaROwlzw9FFpp+Wmbf89CUHf/bw7he+4VjZJz VewfmTc9NWy9rlf/QfyOXCJeTUp0IurXMNHTWEpren/uJXEzdJ3ZsomVrHFv6lSV65 MNwH0QOUZY2WQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Haowen Bai , Kalle Valo , Sasha Levin , stas.yakovlev@gmail.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 05/55] ipw2x00: Fix potential NULL dereference in libipw_xmit() Date: Mon, 30 May 2022 09:46:11 -0400 Message-Id: <20220530134701.1935933-5-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220530134701.1935933-1-sashal@kernel.org> References: <20220530134701.1935933-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Haowen Bai [ Upstream commit e8366bbabe1d207cf7c5b11ae50e223ae6fc278b ] crypt and crypt->ops could be null, so we need to checking null before dereference Signed-off-by: Haowen Bai Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/1648797055-25730-1-git-send-email-baihaowen@meizu.com Signed-off-by: Sasha Levin --- 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 d9baa2fa603b..e4c60caa6543 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.35.1