From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 798C67A for ; Sun, 24 Apr 2022 16:31:50 +0000 (UTC) Received: by mail-pg1-f179.google.com with SMTP id g9so11439422pgc.10 for ; Sun, 24 Apr 2022 09:31:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6r7KK/tVAx0sjPVp3tILmKeJu/38lcENgltnQBPPgeQ=; b=fweOx7s7M54r9NkQZOlYnmgGnowpDNCRIhAzw/6OK12Xu63C4TtLHHXpnb/rHRjCUA gbnkjCEbaDWLU5lHZnTf8/I5eeUyfTkfaC5wL0ju/Nq58cD6VbfzbWH0P7vldzhagY7k cacBwsAIbSvrUnk3bR0VV/0I4CLdCK5QTCyIYnJHkw2B20zhSXfpOH39+gUULRP/ggsZ 0KYfVV0Xf6s9fOP9CzNmAiimrF7K76B+/jCYr/j/Q4o/2toR3l31qJKa6OOuWuOs41/M LjjJU6cffPfAhEAJuMadPG95GIUB0r+pWkOTQcDquojmLSVaAEFt0J6quYqiyR9/yN0s Tebg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6r7KK/tVAx0sjPVp3tILmKeJu/38lcENgltnQBPPgeQ=; b=Pk4UZZFGlJ1HUy+oqibpf+CoS0XgFGShUDwwpkBWX03zhj1IaW+jg4s3pSpHapN1Mb qN548Leycf3L431+pNHKg+LbV1uyRUJNtrFa7S22dKcsQ6rzrOoPh3CmkEjWFBCzSn94 Obb3eaYrTi0PEk52c6COmLmz82O7pkA2VmdHGCjfFiKIfEM3hOIirFZVU+sUemmVIwvO 9mJcm5IgnVUHwbOmxEWOtI8rBbqtFEbQg4rKnhbNgj/ziIaP+bFNFp9b0dD0nnYac4+p x2N6tQHJEUDH8nmG/XWuDD0MMDCdWP3XF3lgkV9ShiKf3Uah1zbdzfq11fIQ4nUp7hnp QRNA== X-Gm-Message-State: AOAM532QOetWYvaz2gIO35GAwBsINK1/6tmyCJRzAgd3LieATjzwr2gk 8OpV/OFMVPD28XlU6ryVqBc= X-Google-Smtp-Source: ABdhPJzIIQ0v51BOpVdy1phawtYwHXhzz9cwWVOjZbc1L6iXmxAf40wS1L03nHY4CWvlG261RaUyqA== X-Received: by 2002:a05:6a00:198c:b0:505:c18b:3184 with SMTP id d12-20020a056a00198c00b00505c18b3184mr14649085pfl.82.1650817910032; Sun, 24 Apr 2022 09:31:50 -0700 (PDT) Received: from makvihas.localhost.com ([2405:201:202b:15:b82e:45af:4bb0:4014]) by smtp.gmail.com with ESMTPSA id i5-20020a635845000000b003aaba2d78c2sm7113472pgm.71.2022.04.24.09.31.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Apr 2022 09:31:49 -0700 (PDT) From: Vihas Makwana To: Larry Finger , Phillip Potter , Greg Kroah-Hartman , Michael Straube Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Dan Carpenter , Pavel Skripkin , Vihas Makwana Subject: [PATCH 2/3] staging: r8188eu: fix null check in _rtw_enqueue_recvframe Date: Sun, 24 Apr 2022 22:01:31 +0530 Message-Id: <20220424163132.37007-3-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220424163132.37007-1-makvihas@gmail.com> References: <20220424163132.37007-1-makvihas@gmail.com> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit There's a NULL check on padapter in rtw_recv.c:189 which makes no sense as rtw_recv.c:184 dereferences it unconditionally and it would have already crashed at this point. Fix this by moving the dereference line inside the check. Signed-off-by: Vihas Makwana --- drivers/staging/r8188eu/core/rtw_recv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r8188eu/core/rtw_recv.c index 4cf9b4b8f..7d306a3c6 100644 --- a/drivers/staging/r8188eu/core/rtw_recv.c +++ b/drivers/staging/r8188eu/core/rtw_recv.c @@ -181,12 +181,13 @@ int rtw_free_recvframe(struct recv_frame *precvframe, struct __queue *pfree_recv int _rtw_enqueue_recvframe(struct recv_frame *precvframe, struct __queue *queue) { struct adapter *padapter = precvframe->adapter; - struct recv_priv *precvpriv = &padapter->recvpriv; + struct recv_priv *precvpriv; list_del_init(&precvframe->list); list_add_tail(&precvframe->list, get_list_head(queue)); if (padapter) { + precvpriv = &padapter->recvpriv; if (queue == &precvpriv->free_recv_queue) precvpriv->free_recvframe_cnt++; } -- 2.30.2