Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp1837431ybn; Thu, 26 Sep 2019 03:00:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqwf09/aoxK2mkec6oz0mR74RNDrqutiSfLfcASxoguNckKNUkB4pZIoPC+RawqwYw9skTQ6 X-Received: by 2002:a50:d808:: with SMTP id o8mr2611444edj.74.1569492055340; Thu, 26 Sep 2019 03:00:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569492055; cv=none; d=google.com; s=arc-20160816; b=QgmSSMT9SzBrHr68nwazZAO/c/uxcLtpBFirNVNbGRVRBhcAPw2dSigvFD0J+WJFZW M3SMy+kIYUwH7sNRwQqBlVHJ3S7P/vn6evG+YCha7W46u2gZ0pOtBrNwSTePp0SPhciF qh5mScvUy/J1p2YAktqNg385PM1s/bVIFEwDxDdymWJvtPOz7NtpDMl6qBSguosZZj4O U2Mx530YaLJ8aubY0wyedJhBpi19S8ZkFwaVQ6+It96gumxnCYJhonmZ1ubNyWbX3M// gUdRzRwqFnpM0TP6/egBEReLh8mnSUBqB4pgj3jYZq34TWCqWw6N7bpeX2nfmAgBWvx4 OI3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=MkF7goRdpeReW9T+fX+Did5lBMAtqHM/JtXL483fHaU=; b=ESApFdw+HVc6C65y1CDTNvZo9iLN9JOFHLb1o+yoEXADgzJPwFXukL5w24/8n1c2vW Zgv7BZ+azhY+V2EeK64CUN2O9pdytQkYagMTOoryLq0mPEBoM3AlYpJGIOwlmNQZS/h9 OTiaSJHYvw37asRTFNyuNX35i/Bnb8si+7K2KwkkUxW/KgORZx7Vfs8pT3KhESopqsCo Ef9ZriqDLSizN1rfjuzh4W38075u8tiyOu1Uic6RjY19TcW7oSg5eZjQalpcl+caXrnv K2kfAh6bYhgMC7v5wCrA5R5sFo4I7SbWVye/olknrodKj/UklSdlIReRZTqOfUUF0R2g Ve6A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=canonical.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x51si984593edd.193.2019.09.26.03.00.31; Thu, 26 Sep 2019 03:00:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726945AbfIYVcu (ORCPT + 99 others); Wed, 25 Sep 2019 17:32:50 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:57196 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726901AbfIYVct (ORCPT ); Wed, 25 Sep 2019 17:32:49 -0400 Received: from mail-pg1-f199.google.com ([209.85.215.199]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iDEu0-0001Iv-RI for linux-kernel@vger.kernel.org; Wed, 25 Sep 2019 21:32:48 +0000 Received: by mail-pg1-f199.google.com with SMTP id b18so600343pgg.8 for ; Wed, 25 Sep 2019 14:32:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=MkF7goRdpeReW9T+fX+Did5lBMAtqHM/JtXL483fHaU=; b=geCEw8xWrZiWzaGSm0D29FMeU2i+5MPFFkQF24yf4ItCYQnQfwTqjd8NjS+bQ9hWye p1sROTjYP6jxXwCPkjUhvM28hs3I9l4VCTmq58dviRpe6O3q3IclTfzbuK7fLaP0QnBV yMeRilrFxE6zTpWfZFecp/Zlwx+yP3qAJlR+mdp+8dv3W2/iSKg8OpACmnumSOBb8FCB /A2Ul4lOG9YTkBjIb7lrwUBovx+0TRBu1+m8AQTJHYZrWHuyvFp/HNGMU0tJEGMYsLtp KBVI3Ok+vo1FhK1Lt0zD2EBT4lfVsHzkpQU7wvCAWN7/TXHCOaL/mlS/W3A/B4+aKcI2 7ePg== X-Gm-Message-State: APjAAAUbksGsIDybdW+IHYPIxbodIkTuGHHcT/A9RmaGWnRtbyv27A++ 6sSKVOvp3FGRdGQc4INssEdE1EYgN/ayz4MehyEyVgU5GDBEJpL5UxG5WJ66q7lLZ4S/Obvkt5T L3Zj2S/rMctYkJOie3Vgt6JxwZGAnYL1woUD0mRLAsg== X-Received: by 2002:a63:471a:: with SMTP id u26mr1442952pga.266.1569447167541; Wed, 25 Sep 2019 14:32:47 -0700 (PDT) X-Received: by 2002:a63:471a:: with SMTP id u26mr1442937pga.266.1569447167322; Wed, 25 Sep 2019 14:32:47 -0700 (PDT) Received: from localhost.localdomain (c-71-63-171-240.hsd1.or.comcast.net. [71.63.171.240]) by smtp.gmail.com with ESMTPSA id 195sm5290313pfz.103.2019.09.25.14.32.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2019 14:32:46 -0700 (PDT) From: Connor Kuehl To: Larry.Finger@lwfinger.net, gregkh@linuxfoundation.org, straube.linux@gmail.com, devel@driverdev.osuosl.org Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH] staging: rtl8188eu: fix possible null dereference Date: Wed, 25 Sep 2019 14:32:15 -0700 Message-Id: <20190925213215.25082-1-connor.kuehl@canonical.com> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Inside a nested 'else' block at the beginning of this function is a call that assigns 'psta' to the return value of 'rtw_get_stainfo()'. If 'rtw_get_stainfo()' returns NULL and the flow of control reaches the 'else if' where 'psta' is dereferenced, then we will dereference a NULL pointer. Fix this by checking if 'psta' is not NULL before reading its 'psta->qos_option' data member. Addresses-Coverity: ("Dereference null return value") Signed-off-by: Connor Kuehl --- drivers/staging/rtl8188eu/core/rtw_xmit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c b/drivers/staging/rtl8188eu/core/rtw_xmit.c index 952f2ab51347..bf8877cbe9b6 100644 --- a/drivers/staging/rtl8188eu/core/rtw_xmit.c +++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c @@ -784,7 +784,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN); memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), ETH_ALEN); - if (psta->qos_option) + if (psta && psta->qos_option) qos_option = true; } else { RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("fw_state:%x is not allowed to xmit frame\n", get_fwstate(pmlmepriv))); -- 2.17.1