Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp1051037ybp; Thu, 17 Oct 2019 07:22:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqyxtF9QnZNkUE4vk+McvFWSzj2aQEPO9y0cMgqipSebV5afEAqiqyerFh9Le+mOk4AQcru/ X-Received: by 2002:a17:907:365:: with SMTP id rs5mr3767291ejb.121.1571322133198; Thu, 17 Oct 2019 07:22:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571322133; cv=none; d=google.com; s=arc-20160816; b=oUtvcjCvk7fViujYybjSwCzw0wB2QkDarUEwTfe1QlL+wMS6i9gpXMcPM7Vj+NSLFB GkYsCu8Tw6CUK8sRX447/zftireLV5nhEjN2Qx++A/2nKgyasKoBXuLuTOoGgEL8bAW3 VzhjZyTTz9TYGQ7F91WKWfNOoQ1Qosufwm02A70QsV5dS3u1s/CbzhiH2k00Fq06wF0M IxXsE9NUQGO/nRo/Rxm7XED8IEN5p320SCLClZAIyu8fWmhChCaF2x6HXFVkLKWtNjoL MjNKIVjwGA3eMMwgt1ZQzlMhsWGrxSBjcymj6HRNbdadLAVZ4cR9IEXJDmRv78+ekBky kSLQ== 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=cPf5Ri38vd/Cw2eFcYlgQuKV2LdN/4W74W9UXmsGuXg=; b=XqJdwjMRNP4EqsaApj81bYtbSjIud6kMychQn7BTEDEDXCjTnHrTBE8U9lEa/yYh0t pcd67whY1GRHxVqOvGHPleNI/oo3egAHbTRzVJzYeih5i3prDXynokG4K1aSZt5fA8E1 yGGqtrWyqQO/bOJhfG+f4nSPmBhN5lRAhEQIsPm8HEK01BvyC2D1QqcS9of9heVes3L5 /xhR+dt42MRmWxYdkUzYVLL+pKKl/U4DVaLQtrGstDj1wdqusEt2o3pm6qMx76crz07P ACEKuGlRqDnepr6cel2g4JJHxbbCeMof0lgURJkYYqDw+sIIEBYO95S0qzpmAsyqvz/q Mvpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DIbuFpeO; 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 b12si1763210edk.16.2019.10.17.07.21.49; Thu, 17 Oct 2019 07:22:13 -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=DIbuFpeO; 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 S2437727AbfJPVzO (ORCPT + 99 others); Wed, 16 Oct 2019 17:55:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:45510 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2395193AbfJPVzI (ORCPT ); Wed, 16 Oct 2019 17:55:08 -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 A3E6821925; Wed, 16 Oct 2019 21:55:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262907; bh=cRkolnWf1aDDalAXR1srpGSUi+osy1m/r8lbUe4kV8M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DIbuFpeOQ00Fmrg2qUEhg1Sxwo2bfe/YMLWRhmtI4qAYlcBtVUWJW5HRCU8sQ/Z6x XrwcYLCcET720zXdtviUdvF/xbQgaHyVmq5+8WiQ2ZVtpBn81znHtvO+MuyhRCQJqA v2KQDI1MOGUCSXQrFyRx1iv8C08wTlORbph7kBls= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold Subject: [PATCH 4.9 68/92] USB: legousbtower: fix slab info leak at probe Date: Wed, 16 Oct 2019 14:50:41 -0700 Message-Id: <20191016214843.366640404@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214759.600329427@linuxfoundation.org> References: <20191016214759.600329427@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 @@ -911,8 +911,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; }