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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 7EEB6C28CC5 for ; Sat, 8 Jun 2019 11:44:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4F0B9214AF for ; Sat, 8 Jun 2019 11:44:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559994271; bh=sP0qLwiA1DHhTCbZonhR0vtEr78HRuXSuI/65FYYT1s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iB/vbQdWheigan2mhqdQ8DCle9FSzn8jdAoe4Ap9wNIQMEhi+KJBpwwMdb9uAbuUk 1gPOFFQF7/bKQgA6R2GOz2ls6oUzD+pABeJEWhcoHUxpsK+cDCypGdnPyJgRpigtgg kLQH2xtR9h7mORuleCjV+D8TXMFbjB7zXKjFE+2s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728831AbfFHLnl (ORCPT ); Sat, 8 Jun 2019 07:43:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:32838 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727724AbfFHLnl (ORCPT ); Sat, 8 Jun 2019 07:43:41 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id ED530214D8; Sat, 8 Jun 2019 11:43:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559994220; bh=sP0qLwiA1DHhTCbZonhR0vtEr78HRuXSuI/65FYYT1s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tPJgUK+MOl+3b2TW6Alkk4T/CLjmAN9SZQ8awzGhJDRuOBjGjrOj/0GBGq+JUcatg v0broGRw13caA5ZSmu02xdOZoQkXI1p2V2CkoJU5F6RNlk/hEo4wyt0GEBte92jsNT mDgVvJLnAaQGg5DHNWJzBxZZqm9T2lQOK42CKJO0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yingjoe Chen , Wolfram Sang , Sasha Levin , linux-i2c@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 26/49] i2c: dev: fix potential memory leak in i2cdev_ioctl_rdwr Date: Sat, 8 Jun 2019 07:42:07 -0400 Message-Id: <20190608114232.8731-26-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190608114232.8731-1-sashal@kernel.org> References: <20190608114232.8731-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Yingjoe Chen [ Upstream commit a0692f0eef91354b62c2b4c94954536536be5425 ] If I2C_M_RECV_LEN check failed, msgs[i].buf allocated by memdup_user will not be freed. Pump index up so it will be freed. Fixes: 838bfa6049fb ("i2c-dev: Add support for I2C_M_RECV_LEN") Signed-off-by: Yingjoe Chen Signed-off-by: Wolfram Sang Signed-off-by: Sasha Levin --- drivers/i2c/i2c-dev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c index ccd76c71af09..cb07651f4b46 100644 --- a/drivers/i2c/i2c-dev.c +++ b/drivers/i2c/i2c-dev.c @@ -283,6 +283,7 @@ static noinline int i2cdev_ioctl_rdwr(struct i2c_client *client, msgs[i].len < 1 || msgs[i].buf[0] < 1 || msgs[i].len < msgs[i].buf[0] + I2C_SMBUS_BLOCK_MAX) { + i++; res = -EINVAL; break; } -- 2.20.1