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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 2A608C433E1 for ; Mon, 8 Jun 2020 23:19:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F134720885 for ; Mon, 8 Jun 2020 23:19:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591658387; bh=4Ok9D8ub18MVS1qOHln09MQiZGWdtWsq9UKEmBr6Lu0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2JD4540PIsnIRcnwWWwb8E/HBFEgvQY4NdV0yI+iuRULieb4kfJsrsWZEtErSe/D7 4sNHkvxCytyPeGTHYvYUUIRX2K1a+aPZZNz4gaUdLgwtJkE5yqMpiLQ2qoSefb0P8m 6EgjQ51t/mD3yuUlnQiCrxOxVT5rf7Q7a7hoWOuE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730851AbgFHXTq (ORCPT ); Mon, 8 Jun 2020 19:19:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:37094 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729260AbgFHXP4 (ORCPT ); Mon, 8 Jun 2020 19:15:56 -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 377512068D; Mon, 8 Jun 2020 23:15:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591658156; bh=4Ok9D8ub18MVS1qOHln09MQiZGWdtWsq9UKEmBr6Lu0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ymxip8G1uqLHAMhyzCBFIIn3cvrYzWtQB1SXBI1QQIHYcfO5JJ5VOqyHo4QbxpFfD 3f+qpnHF9Uk3iOcRiZH8dAlK4C7xgFI2KdRy9Vjg/ZMxnkmutM8cE8aNCSZmVewqZ0 C5CCUUH90pznQXlQcLFWHQF79g6k5M5mj61P3upk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: John Hubbard , Andrew Morton , Matt Porter , Alexandre Bounine , Sumit Semwal , Dan Carpenter , Linus Torvalds , Greg Kroah-Hartman Subject: [PATCH AUTOSEL 5.6 187/606] rapidio: fix an error in get_user_pages_fast() error handling Date: Mon, 8 Jun 2020 19:05:12 -0400 Message-Id: <20200608231211.3363633-187-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200608231211.3363633-1-sashal@kernel.org> References: <20200608231211.3363633-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: John Hubbard commit ffca476a0a8d26de767cc41d62b8ca7f540ecfdd upstream. In the case of get_user_pages_fast() returning fewer pages than requested, rio_dma_transfer() does not quite do the right thing. It attempts to release all the pages that were requested, rather than just the pages that were pinned. Fix the error handling so that only the pages that were successfully pinned are released. Fixes: e8de370188d0 ("rapidio: add mport char device driver") Signed-off-by: John Hubbard Signed-off-by: Andrew Morton Reviewed-by: Andrew Morton Cc: Matt Porter Cc: Alexandre Bounine Cc: Sumit Semwal Cc: Dan Carpenter Cc: Link: http://lkml.kernel.org/r/20200517235620.205225-2-jhubbard@nvidia.com Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- drivers/rapidio/devices/rio_mport_cdev.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c index 8155f59ece38..10af330153b5 100644 --- a/drivers/rapidio/devices/rio_mport_cdev.c +++ b/drivers/rapidio/devices/rio_mport_cdev.c @@ -877,6 +877,11 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode, rmcd_error("pinned %ld out of %ld pages", pinned, nr_pages); ret = -EFAULT; + /* + * Set nr_pages up to mean "how many pages to unpin, in + * the error handler: + */ + nr_pages = pinned; goto err_pg; } -- 2.25.1