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 54B48C28CC5 for ; Sat, 8 Jun 2019 11:40:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2F389214DA for ; Sat, 8 Jun 2019 11:40:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559994058; bh=oRTnIMPHnocH1F7D3G7EC322cznTmIvB1n24vfGQ1UY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cpt8NHxP7hrbSsM05iyCqMJsWbgmInCkC6Py5CeYKTUKnnfELhGsvAFJOCLYr70Ng /LG96RKYaYH6tuCtUJb7FFcADgH6vn3004BU6G9TUw5mRlH5iJMchXmlYdpJwCoN43 p9aZjcPNd5B4O5AE1mpwO1TPPW6QzfiJqawKSEew= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727977AbfFHLk5 (ORCPT ); Sat, 8 Jun 2019 07:40:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:58194 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727934AbfFHLkx (ORCPT ); Sat, 8 Jun 2019 07:40:53 -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 2CF74208C0; Sat, 8 Jun 2019 11:40:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559994052; bh=oRTnIMPHnocH1F7D3G7EC322cznTmIvB1n24vfGQ1UY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tLzwIcBYSM+KUEcaybZstUJBGZFgoMYyNhXeyf5AvEdJ7gAiu81Ga6d6kviOp3ShQ 016eNQpLpNO26IbRuGmQZk3wBPDHQvlbmaMlRwIY5OTgH9VGtUlL50/WcJxCi7aAB6 et7YEIqXTeJuPO0zdLSw4uQYAm6ySO6YCBLN36/Q= 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 5.1 39/70] i2c: dev: fix potential memory leak in i2cdev_ioctl_rdwr Date: Sat, 8 Jun 2019 07:39:18 -0400 Message-Id: <20190608113950.8033-39-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190608113950.8033-1-sashal@kernel.org> References: <20190608113950.8033-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 3f7b9af11137..776f36690448 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