From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA188C43444 for ; Tue, 15 Jan 2019 16:38:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8856720868 for ; Tue, 15 Jan 2019 16:38:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547570323; bh=WlQubIMkGHzijbascApSivVReAnlaZNu5AqVgUTfSNc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gVrYybIyyyXIKVA1fLDgcHpjn7BjeJGwYJz03d/M9kntqn1gVGOiLpgKTvx4a7Y5p 6c+hz4/FWiaVQyzWTtPfVtSin7goPPNlPTRx4ZvJwgYdzv62mxDiY0066lYn9ExfBt pJ+nIE0ndMszeGFYp0PlAfyi/gm8Zrq/0hia5KUE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732132AbfAOQim (ORCPT ); Tue, 15 Jan 2019 11:38:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:54658 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732157AbfAOQil (ORCPT ); Tue, 15 Jan 2019 11:38:41 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 61CA22087E; Tue, 15 Jan 2019 16:38:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547570320; bh=WlQubIMkGHzijbascApSivVReAnlaZNu5AqVgUTfSNc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fe1NkovSuePAC7Fxe+C2NzwREilIZHtMp/NrYLZpB188T3L69A8bbXUhAO6C9dXHX Fd11hZVWqo2UOY7rgKSyAhz5dCHbl3LTjxhl5B+Wb7EtOSbuyEHcJlLVT28GecQ+YK /uFn6CvdiYzHVON+KZ2UW6+yg6JCInlBjaZq1izY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yi Zeng , Wolfram Sang , stable@kernel.org Subject: [PATCH 4.4 48/51] i2c: dev: prevent adapter retries and timeout being set as minus value Date: Tue, 15 Jan 2019 17:35:44 +0100 Message-Id: <20190115154853.964493126@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190115154846.928796000@linuxfoundation.org> References: <20190115154846.928796000@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yi Zeng commit 6ebec961d59bccf65d08b13fc1ad4e6272a89338 upstream. If adapter->retries is set to a minus value from user space via ioctl, it will make __i2c_transfer and __i2c_smbus_xfer skip the calling to adapter->algo->master_xfer and adapter->algo->smbus_xfer that is registered by the underlying bus drivers, and return value 0 to all the callers. The bus driver will never be accessed anymore by all users, besides, the users may still get successful return value without any error or information log print out. If adapter->timeout is set to minus value from user space via ioctl, it will make the retrying loop in __i2c_transfer and __i2c_smbus_xfer always break after the the first try, due to the time_after always returns true. Signed-off-by: Yi Zeng [wsa: minor grammar updates to commit message] Signed-off-by: Wolfram Sang Cc: stable@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/i2c/i2c-dev.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/drivers/i2c/i2c-dev.c +++ b/drivers/i2c/i2c-dev.c @@ -459,9 +459,15 @@ static long i2cdev_ioctl(struct file *fi return i2cdev_ioctl_smbus(client, arg); case I2C_RETRIES: + if (arg > INT_MAX) + return -EINVAL; + client->adapter->retries = arg; break; case I2C_TIMEOUT: + if (arg > INT_MAX) + return -EINVAL; + /* For historical reasons, user-space sets the timeout * value in units of 10 ms. */