Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp347582ybi; Fri, 7 Jun 2019 09:01:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqyP9k0HxGiKztgvP13koHdYuJfkM14rRI0ruOnYrnX8Pb8epX4ytB7ph4SEUh0RUov59f73 X-Received: by 2002:a65:56c2:: with SMTP id w2mr3540396pgs.49.1559923303479; Fri, 07 Jun 2019 09:01:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559923303; cv=none; d=google.com; s=arc-20160816; b=tMhbS5Hl9v3cPZHxKicnihlDOOU+oE0bud9x0hpNH95MzD0u5uUhAyMnqZT2OBiEeW g7Hn9sDcS36t70kUW7HFsLL73xN90F7XTO/KFiX7SkXaWoHTBorU1yYyYYrCLWJ4NUcR dSGF3WUYewap+DCEUxm9rzRCT/8G0pZxHgIpgP+7LAEU8c59eD+YqSpi50lwxbeHpwx/ Oqo0UDWUPYGqv+5+NJxYMJas134i0I0i56Pimxc6DFLlbJzB5nJxMA5nTB8OrBiBt1s4 duO29eRazlL7CukgvkDNUoGLfTPdKV2FEbM60ru47PD/41tveh3df/j2Vthh+PnB4F5E 9tHA== 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=w/yKaZw+h8OrlSluzkee8lvLQO3tQPj13VDoZkdQbzI=; b=AEw0kzdhCnJtifZkxo487Lgw5qfCUXJ/w12opOj2TDZVLs5HKyeqcERjBIpMdohdUj cz0heSxtyjRDQGM6VkN8lxNt4UAbNbvfUK+XSapAQpJj+dG6KIbGG88Kan2uYQUw0w4V C3qs2RgvWIChKubYl83glHUJo1+k3dQgu19TrYxQlQU/r/q7/9W9xUH7iy9ABoszFqPs bQMg6Qxcqw0+gUk1Ny6hLMvJ/FyIKedyhDgVYS3tsiJ0IZHQdBURYtyxCgJrrQuggVG1 H0jlWqX+1STzNVTsiuQ3K38DbWuvbDxx0zHlWBsf1AG+XKc7sQUSaDAD0XNXkOtmk9xq GStw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ITmj3j7o; 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 e5si2091403pgs.463.2019.06.07.09.01.25; Fri, 07 Jun 2019 09:01:43 -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=ITmj3j7o; 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 S1730384AbfFGPlq (ORCPT + 99 others); Fri, 7 Jun 2019 11:41:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:51826 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730344AbfFGPlo (ORCPT ); Fri, 7 Jun 2019 11:41:44 -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 206C2212F5; Fri, 7 Jun 2019 15:41:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922103; bh=W4xXiCNpUlaK05IXKCxUYEQDrxsvb0sVGBlb/OnFcPs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ITmj3j7oWU8dwVp16Ake9PU4Qa3PqSvkBzsRPav133u5sv2IAJCB+k6c9XEeyrpMt x25jxceC6A876Hot8aAP1acPtUWfs0L16c/OKJyJ6uphpfC31CfzNaaR07AISTjfG/ IBUlAUk2MwLvUSEZDQnH/LtlGqIsIou224GYRZ5k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mauro Carvalho Chehab Subject: [PATCH 4.14 36/69] media: smsusb: better handle optional alignment Date: Fri, 7 Jun 2019 17:39:17 +0200 Message-Id: <20190607153852.830984643@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: Mauro Carvalho Chehab commit a47686636d84eaec5c9c6e84bd5f96bed34d526d upstream. Most Siano devices require an alignment for the response. Changeset f3be52b0056a ("media: usb: siano: Fix general protection fault in smsusb") changed the logic with gets such aligment, but it now produces a sparce warning: drivers/media/usb/siano/smsusb.c: In function 'smsusb_init_device': drivers/media/usb/siano/smsusb.c:447:37: warning: 'in_maxp' may be used uninitialized in this function [-Wmaybe-uninitialized] 447 | dev->response_alignment = in_maxp - sizeof(struct sms_msg_hdr); | ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~ The sparse message itself is bogus, but a broken (or fake) USB eeprom could produce a negative value for response_alignment. So, change the code in order to check if the result is not negative. Fixes: 31e0456de5be ("media: usb: siano: Fix general protection fault in smsusb") CC: Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/usb/siano/smsusb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/drivers/media/usb/siano/smsusb.c +++ b/drivers/media/usb/siano/smsusb.c @@ -402,7 +402,7 @@ static int smsusb_init_device(struct usb struct smsusb_device_t *dev; void *mdev; int i, rc; - int in_maxp = 0; + int align = 0; /* create device object */ dev = kzalloc(sizeof(struct smsusb_device_t), GFP_KERNEL); @@ -420,14 +420,14 @@ static int smsusb_init_device(struct usb if (desc->bEndpointAddress & USB_DIR_IN) { dev->in_ep = desc->bEndpointAddress; - in_maxp = usb_endpoint_maxp(desc); + align = usb_endpoint_maxp(desc) - sizeof(struct sms_msg_hdr); } else { dev->out_ep = desc->bEndpointAddress; } } pr_debug("in_ep = %02x, out_ep = %02x\n", dev->in_ep, dev->out_ep); - if (!dev->in_ep || !dev->out_ep) { /* Missing endpoints? */ + if (!dev->in_ep || !dev->out_ep || align < 0) { /* Missing endpoints? */ smsusb_term_device(intf); return -ENODEV; } @@ -446,7 +446,7 @@ static int smsusb_init_device(struct usb /* fall-thru */ default: dev->buffer_size = USB2_BUFFER_SIZE; - dev->response_alignment = in_maxp - sizeof(struct sms_msg_hdr); + dev->response_alignment = align; params.flags |= SMS_DEVICE_FAMILY2; break;