Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3517524pxf; Mon, 15 Mar 2021 11:18:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFFYqsQSLXjvDDBi/OIBW/cyHKfGsrqVUz9VdPurreoPS+QBHNMxZMOX+ca7bP3NA2wTRm X-Received: by 2002:a17:906:4f10:: with SMTP id t16mr25269930eju.531.1615832298909; Mon, 15 Mar 2021 11:18:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615832298; cv=none; d=google.com; s=arc-20160816; b=HXyWRP9tLuiXJBZC9TJa2oj/uwiPxJL4+SyBHWs/LwuyY+1KMAukkOQXp1ERH2R0B9 SMVb+H5PbBxN7hAsk/VJfgZ7q3n59xpAIq1HTrawGFuMqayHQjUOOM9qLUxGmDG/8Opv pLze2NG9Jq8mZNPwj1j0YufoGDDwZ/OuRaiqmExiQqJy2IFwnROFwXqlEjaXwJGFmvmv gnpaSzzTBEMISj6/W0WUBMjoQGWFKjzVnJ/6jpm+6hEGmND01rHvzO+HMNcZV6Z3xutP 8/JiU2TWFELgNvBG3UGfdiS3mfxJwVtFYYUBeL0OAaZJKkF37K+TejGg6R9vl1vHbtfa 6kCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hldmNJqa6y5uX2rL5396IDPBp+tN5l0rLu5tWctuUUc=; b=PW+t0e7QxF42VTZVL3EjytYAn/rdp7NeRrbYDBqTeEp7VpJxjgQhDLJexI2olDvK0H FUVakYgh/pReFsvqDs0GUNprrTK/TnffVkJMPV+CeIqDhoFxQ0wW1h8r2FR4ZId7a57Z GzREKaW5Bd46VasssnhnqYBkRbTPE0MjbxG+y5XmYOOTmDAA28Rib1QC7KwjznNO7NRi uxuc6bkRydEyWpBoxdbfuPt+yZ/mhjw18sJ2wdPhxD+3pHpI9nC0jEGwRlGesk0g5Gzo +PBONh7uV8UG54+PpnukPfC236DKpTGJm8Wi/cpxjUcOGZb9AXHss0MiggrCNhsM+lPd H+7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="lQhC/5H5"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id hp15si11634332ejc.548.2021.03.15.11.17.55; Mon, 15 Mar 2021 11:18:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="lQhC/5H5"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236862AbhCOOPy (ORCPT + 99 others); Mon, 15 Mar 2021 10:15:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:37582 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232426AbhCON7P (ORCPT ); Mon, 15 Mar 2021 09:59:15 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0C96D64F4A; Mon, 15 Mar 2021 13:58:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615816734; bh=FAEVE6XHouPTJcwLoC8YlshzinAWao+eLhloMA++pAk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lQhC/5H5/KG476DycB9R+1aQieqcQo/JWxHsDJSEQuIMqjgOe30LwwcX2qrKTnZ0w KXEfhvg2ny7a5if06+qN6jJ+fx4o2dR7ag7YOzaTs7VdkgJKLJBTMJFLXVPzIyYMPV u1/ELZXwNIYdVcOPGY78bF+E/z6Y7atPH7kR4rvE= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wang Qing , Heiko Carstens Subject: [PATCH 4.14 26/95] s390/cio: return -EFAULT if copy_to_user() fails again Date: Mon, 15 Mar 2021 14:56:56 +0100 Message-Id: <20210315135741.136814477@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135740.245494252@linuxfoundation.org> References: <20210315135740.245494252@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Kroah-Hartman From: Wang Qing commit 51c44babdc19aaf882e1213325a0ba291573308f upstream. The copy_to_user() function returns the number of bytes remaining to be copied, but we want to return -EFAULT if the copy doesn't complete. Fixes: e01bcdd61320 ("vfio: ccw: realize VFIO_DEVICE_GET_REGION_INFO ioctl") Signed-off-by: Wang Qing Signed-off-by: Heiko Carstens Link: https://lore.kernel.org/r/1614600093-13992-1-git-send-email-wangqing@vivo.com Signed-off-by: Heiko Carstens Signed-off-by: Greg Kroah-Hartman --- drivers/s390/cio/vfio_ccw_ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/s390/cio/vfio_ccw_ops.c +++ b/drivers/s390/cio/vfio_ccw_ops.c @@ -341,7 +341,7 @@ static ssize_t vfio_ccw_mdev_ioctl(struc if (ret) return ret; - return copy_to_user((void __user *)arg, &info, minsz); + return copy_to_user((void __user *)arg, &info, minsz) ? -EFAULT : 0; } case VFIO_DEVICE_GET_REGION_INFO: { @@ -362,7 +362,7 @@ static ssize_t vfio_ccw_mdev_ioctl(struc if (ret) return ret; - return copy_to_user((void __user *)arg, &info, minsz); + return copy_to_user((void __user *)arg, &info, minsz) ? -EFAULT : 0; } case VFIO_DEVICE_GET_IRQ_INFO: {