Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp349982ybi; Fri, 7 Jun 2019 09:03:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqypLtW0v75cY+BA2IQWOcc833zf0YaHnWZKNGeFzMKZrvHdC80EXQaxnSYLwmkdi8gEUxA+ X-Received: by 2002:aa7:9095:: with SMTP id i21mr55131263pfa.119.1559923421133; Fri, 07 Jun 2019 09:03:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559923421; cv=none; d=google.com; s=arc-20160816; b=nizn5B/CcV5bPS/S53zYtbTcmYcJ0s4tz6eruBepj1Wuyy2ZDlfZkCfdbV1Q3dYkVi xtqSAvQNERjNv7K53XHRSzRQ/QRuOI0FS4T+KO5gPi2WnrFKpP24QRHxVo718pbLsld8 6hKA+jwUq4v6O/GX96X+5KQz5HKn+iz9KOaybHbcS+gcbh9G/vxI90BcHW8EthFhMJB+ 4GL4LgCutzSGLIniUVGR7muB6i8zeLeDmB3r02+c77+DW1Jbqwn9cU0P5WAoBTM8bo1t ymLwn0A7ZyZuLr9aGawWuJhCck09Y3QECdlpkw07HLWOV/yXRwN9PY4H5znExbVvKykj mL4w== 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=Dt/zdXjCaM0MQMYVPFCIapyVh7Ycn/v+15SK6CuDQFs=; b=U7xMfX0RnhkjjXhBdwA8gJEw35p1vs8klYZUHiwHB2tPcWz+N4mGgYcwVLCoGsE/tS 1JMS5mDLrY4uRKs9eSIy9+2V+z+GRfa2ClejvRyXfgwIE0/tYutQNHtmfphr/QQ2z8Ep BLPpQT81iKZoGQt8+nYDW23Bwlm6j17GzLc+QHEGGLwo2p6IDvvq+sevYVPXMkQOTv4l 6XfpfOmfFSIbeZKXju7VGfl+0mUSZkXLRvZr9p9n9mt7tHnFT8NTbih1S6lUmcyAqk2h QZLEcEP+AXgMWELR0Pk4mARg0OOqL8nS92HhUnopUS7qUrsb7UB2J0Lc2cyB8bY1Qr6S eUjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qy1zL8lQ; 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 i11si2079201plt.92.2019.06.07.09.03.22; Fri, 07 Jun 2019 09:03:41 -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=qy1zL8lQ; 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 S1730435AbfFGP7l (ORCPT + 99 others); Fri, 7 Jun 2019 11:59:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:51568 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730334AbfFGPlf (ORCPT ); Fri, 7 Jun 2019 11:41:35 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 41D46212F5; Fri, 7 Jun 2019 15:41:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922094; bh=xFULexyD9/K5lBAkx3sJQH53ybfnXEHI3FhWIIrHfFE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qy1zL8lQ9L7y85llGR65LzRwVFv/wL94eHUnOQ4aC9g6Npb7rmmx38jOrf6z2Fx8N oJ4VGT6BNBCzsuxiouV8tANYJPfvsB7jrVGflVuVkZgnys1Dn3EfIXu4WvMZgfu2bT kIqW7buDaZX/IQPTB5gLoJm1qLEx74KhzkmsP6Bg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Oliver Neukum Subject: [PATCH 4.14 33/69] USB: rio500: fix memory leak in close after disconnect Date: Fri, 7 Jun 2019 17:39:14 +0200 Message-Id: <20190607153852.479966741@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190607153848.271562617@linuxfoundation.org> References: <20190607153848.271562617@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: Oliver Neukum commit e0feb73428b69322dd5caae90b0207de369b5575 upstream. If a disconnected device is closed, rio_close() must free the buffers. Signed-off-by: Oliver Neukum Cc: stable Signed-off-by: Greg Kroah-Hartman --- drivers/usb/misc/rio500.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) --- a/drivers/usb/misc/rio500.c +++ b/drivers/usb/misc/rio500.c @@ -99,9 +99,22 @@ static int close_rio(struct inode *inode { struct rio_usb_data *rio = &rio_instance; - rio->isopen = 0; + /* against disconnect() */ + mutex_lock(&rio500_mutex); + mutex_lock(&(rio->lock)); - dev_info(&rio->rio_dev->dev, "Rio closed.\n"); + rio->isopen = 0; + if (!rio->present) { + /* cleanup has been delayed */ + kfree(rio->ibuf); + kfree(rio->obuf); + rio->ibuf = NULL; + rio->obuf = NULL; + } else { + dev_info(&rio->rio_dev->dev, "Rio closed.\n"); + } + mutex_unlock(&(rio->lock)); + mutex_unlock(&rio500_mutex); return 0; }