Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp235256ybg; Thu, 17 Oct 2019 22:06:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqzt+jCpeztTq7SIjZBlbgfDF5rY8NfIHaRxB7S5GWW1cgfNBb4nnaYf38EIV3j/8MIsFdZC X-Received: by 2002:a50:fb84:: with SMTP id e4mr7613352edq.181.1571375202303; Thu, 17 Oct 2019 22:06:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571375202; cv=none; d=google.com; s=arc-20160816; b=hT+nByndZChkUbaEL+Wnm+XmyylwOD9OuNZ/7/mjsej3QbshhHavtmSW7JIGKrvcnF HVDliPOEVZ1M2OpDAji2R+F27tp3mpRNdNg5qU1K5jKGvfat8GhwpLya915WENtE9eC6 iY+qRjLUws6ssgRC/uagNNza35io/GJc1YLDix9jAIMr/xBAdDbOjzbZ1hr8l6+XA5Vm 9c2Ia1Gbo/Hde43eIhMN9rb1wcZTbJBRDakrETHVrqTTNPYeYbPyhfNjMoS5OHRCi947 SK1sx/Xu73lrfAEXbPgIKRkn55I5rjoessbP+tIlEB3FU1ieLI71JVrnHXx1hgR/a1Cu kKEg== 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=pBcJpU+VtZOohbKOe1dVM/4paakSbtZ6l0rkxLL+9nU=; b=dHdvYCfBEFdPSWOsdOmrcGf+apvdS8g0c/+gsXULkmjnRNA77b435p1QI6K1URDA1s TF69ZB9DwCDQD+22+Dq3FEs5hiqD/Z72YuCWpKNYjJp4ldu2XHMTa/erB5bQzxsMtYF5 WCsoS6wr2wm+dOfoqk/2WRXjwft9RHxULWsoApMfVBoDn2NpQqMI/DweY/Nfdih2cGlU BzoUV0wUsJbSkjQcsW/LC8Q5XUIgP/K4N90RcuZGgjjvM2e3JLyqJVOiO3EhPqKXu0Wh 4wtbWC/53uaZZ1Q4Y2aA773r5E6ljSM2ZoWUeP7J5QcquGu7kRVE3LCqokNlg01aOFEP qARA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=YChsu2yj; 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 c24si3109767edt.364.2019.10.17.22.06.19; Thu, 17 Oct 2019 22:06:42 -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=YChsu2yj; 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 S2407573AbfJPWVT (ORCPT + 99 others); Wed, 16 Oct 2019 18:21:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:42648 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2437553AbfJPVxh (ORCPT ); Wed, 16 Oct 2019 17:53:37 -0400 Received: from localhost (unknown [192.55.54.58]) (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 C892421928; Wed, 16 Oct 2019 21:53:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262816; bh=v7jPuxTaNfvQo0RFwf9rffYtA8ruCixICaVy6ahYeyA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YChsu2yjM9HQQBGt+azCFzIccNov5O4W6HqtEyAluPtr+gA9pvE9zDWhmpamTki70 OOTx0n/asr6Cvf6OLL+qcrkY50jrm4j5bhjObh5yKtz4rX9yDAo6S53AU7bue14Jmm yCYCtN8ym5iJN7aZS9BbpJSEvBXi3focg3fx8UuM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold Subject: [PATCH 4.4 59/79] USB: legousbtower: fix slab info leak at probe Date: Wed, 16 Oct 2019 14:50:34 -0700 Message-Id: <20191016214822.137161555@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214729.758892904@linuxfoundation.org> References: <20191016214729.758892904@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: Johan Hovold commit 1d427be4a39defadda6dd8f4659bc17f7591740f upstream. Make sure to check for short transfers when retrieving the version information at probe to avoid leaking uninitialised slab data when logging it. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Cc: stable Signed-off-by: Johan Hovold Link: https://lore.kernel.org/r/20190919083039.30898-2-johan@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/usb/misc/legousbtower.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/usb/misc/legousbtower.c +++ b/drivers/usb/misc/legousbtower.c @@ -923,8 +923,10 @@ static int tower_probe (struct usb_inter get_version_reply, sizeof(*get_version_reply), 1000); - if (result < 0) { - dev_err(idev, "LEGO USB Tower get version control request failed\n"); + if (result < sizeof(*get_version_reply)) { + if (result >= 0) + result = -EIO; + dev_err(idev, "get version request failed: %d\n", result); retval = result; goto error; }