From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3397032-1523481726-2-8741023691172052531 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1523481725; b=SJT6EBNbdQy5LezvAc0zezKdNbbqithPvWIUNHJSRJeAyvrdyq gppRuARgsUq9Xg3d+m3R72k/ZUXGNNlkNDmXW5Q0HZSmOvxYaZI0XOc+cdL/Q1X/ Y589y0McC+S/eO2fF4WF9XTAcdEnXwkf8Q/WQlE1V5G7a1sjdwqY22KuCS5K/yn4 6EBa5AEKLEmsTIqI5TsVgbzy71gNCt9BfNoRazWktEIeSaMrbrWRsDGkz0kjKjsc YyeMyKE/x7pm41zIg9TRctUVC4XvZBSwo5tAI8NHNBP5ChGhqakEgP+sdjZ9lbNW d/aFV8ZoeVvy1qBnfIzyhXUu217ZK50KkEqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=fm2; t=1523481725; bh=evThJ80OnVEYGGJ+cympjDbt3ovjXq FpP23v3CKCoMA=; b=j+A8O6NPrRFxly/xwaTjYFMplGZtTTrwJ6cutGA2vAbNNE /h1f8lXZ8v5Zm6uyQtZmQtiJi2aBEuahGufv7EepP6dk/xIyeghvEPImuijsAw28 oE51NCAcQnFEalba+BgbDTCbL4HSFZDYchU16VX/DrrD8SlCkyhA1JVUsoK9TadC HYmBgEMBRfxgXaFooB/U/JXN9wCR469eArhebQbHa22akaS0UL5EOp9vzRCGFXaf L1ZmxW/RLOZroOG69VkKxNP0RaS3mwzP6fWRU5Fzxk3nv0LzB0KZl7gx19qjeILP gTG/mDUIh1Grg/CgEmYWGrUx/oF574C0qvzdMrNQ== ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx1.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfG/gj1BEGeKow5sqMYd+rTo34hLiaWVJXiJMafJ3YfIlVkzPbNc+5QaKhxEYZEnlTv7//ydHR+bqsO3uGjX3R3mOsADnQxGr7XN58sjaNziTuzYArnhm y7eJ72w7WlPU8ZGyZVsGoof+GWsmn/YCA/99nK+lkA2sed2ACkco9zzkRNHnnGSJ6dGDQE8KUKBUQZ5YDSaiG7B5WHN/fzT/+n3rhkCDP2h3ZC+26XtPxyAk X-CM-Analysis: v=2.3 cv=WaUilXpX c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=Kd1tUaAdevIA:10 a=DfNHnWVPAAAA:8 a=EUspDBNiAAAA:8 a=yMhMjlubAAAA:8 a=ag1SF4gXAAAA:8 a=mFJlSFYP1aaS0j_PnB4A:9 a=QEXdDO2ut3YA:10 a=rjTVMONInIDnV1a_A2c_:22 a=rMCfJy6NHDicN4J276Yl:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754894AbeDKVVu (ORCPT ); Wed, 11 Apr 2018 17:21:50 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:55618 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754285AbeDKSjG (ORCPT ); Wed, 11 Apr 2018 14:39:06 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Colin Ian King , Kalle Valo , Sasha Levin Subject: [PATCH 3.18 033/121] ath5k: fix memory leak on buf on failed eeprom read Date: Wed, 11 Apr 2018 20:35:36 +0200 Message-Id: <20180411183458.093745995@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183456.195010921@linuxfoundation.org> References: <20180411183456.195010921@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Colin Ian King [ Upstream commit 8fed6823e06e43ee9cf7c0ffecec2f9111ce6201 ] The AR5K_EEPROM_READ macro returns with -EIO if a read error occurs causing a memory leak on the allocated buffer buf. Fix this by explicitly calling ath5k_hw_nvram_read and exiting on the via the freebuf label that performs the necessary free'ing of buf when a read error occurs. Detected by CoverityScan, CID#1248782 ("Resource Leak") Signed-off-by: Colin Ian King Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/ath/ath5k/debug.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/drivers/net/wireless/ath/ath5k/debug.c +++ b/drivers/net/wireless/ath/ath5k/debug.c @@ -939,7 +939,10 @@ static int open_file_eeprom(struct inode } for (i = 0; i < eesize; ++i) { - AR5K_EEPROM_READ(i, val); + if (!ath5k_hw_nvram_read(ah, i, &val)) { + ret = -EIO; + goto freebuf; + } buf[i] = val; }