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_HELO_NONE,SPF_PASS,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 7EC2FC49ED7 for ; Thu, 19 Sep 2019 22:27:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 45ED720640 for ; Thu, 19 Sep 2019 22:27:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568932030; bh=PS4psoici0H95izA0+rLc0LA6/LF/xpQ0WNCxnaETgo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ECrjr5FglOp3+ok5E4+COTFvUoJGNtQl/g1bp5gwkWW5Q0amWnv8+rpapHrqjA4sZ d+RMqOVK7FTsUeo10XEM6AWGzpEwa6hIr8g+K4geLKXPpb4lepopc4UaRmFaOpTgXA LvTdUAYnsH0dmXFydkP6wZK92LOa8ren4qh6ootw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406697AbfISWVQ (ORCPT ); Thu, 19 Sep 2019 18:21:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:35686 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2406696AbfISWVQ (ORCPT ); Thu, 19 Sep 2019 18:21:16 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 25CCD21924; Thu, 19 Sep 2019 22:21:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568931675; bh=PS4psoici0H95izA0+rLc0LA6/LF/xpQ0WNCxnaETgo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RDvWytPPiRfQs3yKd7bm1thG395y3KGSUG37KCFpuxfnGGVvTgPTLCdGTK2ka/tpz 7RuRp3imJmkCUPgQWMcjpNBVJtUh/HKhxWPUZ5oJc47rmcfodA4+S1pb11tFW+MjWU B4R+bEj6XrHg1z6S7U3MICRQJNdGke3Vl6GlS3kE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexander Popov , Mukesh Ojha , Jann Horn , Jens Axboe Subject: [PATCH 4.9 72/74] floppy: fix usercopy direction Date: Fri, 20 Sep 2019 00:04:25 +0200 Message-Id: <20190919214811.404794753@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190919214800.519074117@linuxfoundation.org> References: <20190919214800.519074117@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Jann Horn commit 52f6f9d74f31078964ca1574f7bb612da7877ac8 upstream. As sparse points out, these two copy_from_user() should actually be copy_to_user(). Fixes: 229b53c9bf4e ("take floppy compat ioctls to sodding floppy.c") Cc: stable@vger.kernel.org Acked-by: Alexander Popov Reviewed-by: Mukesh Ojha Signed-off-by: Jann Horn Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- drivers/block/floppy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -3784,7 +3784,7 @@ static int compat_getdrvprm(int drive, v.native_format = UDP->native_format; mutex_unlock(&floppy_mutex); - if (copy_from_user(arg, &v, sizeof(struct compat_floppy_drive_params))) + if (copy_to_user(arg, &v, sizeof(struct compat_floppy_drive_params))) return -EFAULT; return 0; } @@ -3820,7 +3820,7 @@ static int compat_getdrvstat(int drive, v.bufblocks = UDRS->bufblocks; mutex_unlock(&floppy_mutex); - if (copy_from_user(arg, &v, sizeof(struct compat_floppy_drive_struct))) + if (copy_to_user(arg, &v, sizeof(struct compat_floppy_drive_struct))) return -EFAULT; return 0; Eintr: