Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2746316ybg; Mon, 28 Oct 2019 01:30:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqw5FJrqOO+O556oa6WN1Wgjl2lzhOREzymaXQHVhWLxiqJsoRlqarygVUcmprZ3aigX81bS X-Received: by 2002:a17:906:386:: with SMTP id b6mr15117806eja.148.1572251425349; Mon, 28 Oct 2019 01:30:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572251425; cv=none; d=google.com; s=arc-20160816; b=rCN9962eP3ApYfeFwBP77578OCPOrR+P1uyB8DufaeUTIVAAoyGXoFpMCRoVdcmiHs xFQYlIGOf7SgoP0k0NKDWzt/VXz2sbFJUDviV0AXRDIyOjz+M7J0YYMhvuYfuze2m1K3 4D8kwWNtHnIAskV2uOQHL5zttjjzawu4+BUcbMXE4RFjyn/pXR8pVpZ2a06xPFCGu34L gHL1ry8vJqe46hIeLwrBL1s9rxeFnhCup5AqlGvawdFNADiDAHaa+ywot9k25WdCevEA Yvr8WG7ccmLM7iRtMvABC+OcTUYzuTD+Bik5w6d8KXLFlHayMCZp1+z5EW53fs+Oylz9 GSBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=MhDA93sGe21ht2zB1nFBL9hgEYlrnwNV4h/cgdonLdw=; b=xMW7WAhgFqzRUZYlzvLhqKi8kfdOvh4fp5bMXvob0sXok3omcyWC4w2BQpX3vUZ1DQ 4RJhpyppfJjpwidgI8hdxklUg0PBf1I0ENQQpOLDjdqBssNrPkiS5zRXjysdeCRyahz0 GHQXA0001pnT5tWUjfPi9uUdg2L3WCm6CieCnnGrj61Gi6nSLf6n7O4nD85gn896MTXe lLA12sPx1r2cL8pkqcbLqsDYXeV66eh62RFWBBXuk/KCaT7LuHf9I+rRV/9qIiF6TtKG T0VY7I+5YiJj0LTYRvdIqThDEJqjxpQkk1+9DYxSzDEWmSGfSAH8x97KC7yA3UFAQYno c1Lg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JcBeY3Dp; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e8si3315706edk.444.2019.10.28.01.30.02; Mon, 28 Oct 2019 01:30:25 -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; dkim=pass header.i=@kernel.org header.s=default header.b=JcBeY3Dp; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731378AbfJ0VV6 (ORCPT + 99 others); Sun, 27 Oct 2019 17:21:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:42866 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732026AbfJ0VV4 (ORCPT ); Sun, 27 Oct 2019 17:21:56 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 14F43205C9; Sun, 27 Oct 2019 21:21:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211315; bh=FuV+3NGlIG1r2QypvByxsG4PHLkX1S6gLQQfftQLVLE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JcBeY3DpcJM6TfdvSopCoJfCwqrvVDlfLXLFLnEQMVyo1EF1VM+ij2BKwnUXo+qC8 nq+8pqn/WKFxheYlpkGkT5+s7TXWxegvqLIaA+FiTF8zTW5EL1hinyY/pPytE+zI2n Qae15MF5CokN+mDHg3PJBk1ssEUYa5tiss7WPbXc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Colin Ian King Subject: [PATCH 5.3 108/197] staging: wlan-ng: fix exit return when sme->key_idx >= NUM_WEPKEYS Date: Sun, 27 Oct 2019 22:00:26 +0100 Message-Id: <20191027203357.583978143@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Colin Ian King commit 153c5d8191c26165dbbd2646448ca7207f7796d0 upstream. Currently the exit return path when sme->key_idx >= NUM_WEPKEYS is via label 'exit' and this checks if result is non-zero, however result has not been initialized and contains garbage. Fix this by replacing the goto with a return with the error code. Addresses-Coverity: ("Uninitialized scalar variable") Fixes: 0ca6d8e74489 ("Staging: wlan-ng: replace switch-case statements with macro") Signed-off-by: Colin Ian King Cc: stable Link: https://lore.kernel.org/r/20191014110201.9874-1-colin.king@canonical.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wlan-ng/cfg80211.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/drivers/staging/wlan-ng/cfg80211.c +++ b/drivers/staging/wlan-ng/cfg80211.c @@ -469,10 +469,8 @@ static int prism2_connect(struct wiphy * /* Set the encryption - we only support wep */ if (is_wep) { if (sme->key) { - if (sme->key_idx >= NUM_WEPKEYS) { - err = -EINVAL; - goto exit; - } + if (sme->key_idx >= NUM_WEPKEYS) + return -EINVAL; result = prism2_domibset_uint32(wlandev, DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID,