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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 42D65C43461 for ; Mon, 12 Apr 2021 16:40:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 206DD6134F for ; Mon, 12 Apr 2021 16:40:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344185AbhDLQjP (ORCPT ); Mon, 12 Apr 2021 12:39:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:35510 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243766AbhDLQaS (ORCPT ); Mon, 12 Apr 2021 12:30:18 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 474C76139C; Mon, 12 Apr 2021 16:25:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618244759; bh=wQmhuzaCHK+pZWUvY/gW8zm0lQr9CrxBVVbOKseXz0M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AJVlgUb+NRcWK9aaFy19WIPNDPYkSoeBGLPug83HYVP7deJbd6olatU3BYxi4yY3F KbQiolF/Ln8kqfdi6q3sgxubhJQFvFfOLSqDBFWL+yw3p3a7Ilss8tXzUr3/8LiYot HVx+NJs4NoA6eruCxj8zzrEHTeSAV1s8S006VpjJm2m5tsI5l6iKMDL7JKghCZjy0r n97X9ToSYTMi28d/IjibNl+zYvu2kh8KP0pkwXwzLnnvS+ROETHoNaHjkTw5uAkDSr j7LassIdsorzQJPlyZaGcrF8cztBcANKH6kTVILVL7StFfN6JK2CgwpmJOGIN9WAIT V2Fec8UlKD/vA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wang Qing , Vineet Gupta , Sasha Levin , linux-snps-arc@lists.infradead.org Subject: [PATCH AUTOSEL 4.19 05/28] arc: kernel: Return -EFAULT if copy_to_user() fails Date: Mon, 12 Apr 2021 12:25:30 -0400 Message-Id: <20210412162553.315227-5-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210412162553.315227-1-sashal@kernel.org> References: <20210412162553.315227-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wang Qing [ Upstream commit 46e152186cd89d940b26726fff11eb3f4935b45a ] 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. Signed-off-by: Wang Qing Signed-off-by: Vineet Gupta Signed-off-by: Sasha Levin --- arch/arc/kernel/signal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arc/kernel/signal.c b/arch/arc/kernel/signal.c index 48685445002e..da243420bcb5 100644 --- a/arch/arc/kernel/signal.c +++ b/arch/arc/kernel/signal.c @@ -99,7 +99,7 @@ stash_usr_regs(struct rt_sigframe __user *sf, struct pt_regs *regs, sizeof(sf->uc.uc_mcontext.regs.scratch)); err |= __copy_to_user(&sf->uc.uc_sigmask, set, sizeof(sigset_t)); - return err; + return err ? -EFAULT : 0; } static int restore_usr_regs(struct pt_regs *regs, struct rt_sigframe __user *sf) @@ -113,7 +113,7 @@ static int restore_usr_regs(struct pt_regs *regs, struct rt_sigframe __user *sf) &(sf->uc.uc_mcontext.regs.scratch), sizeof(sf->uc.uc_mcontext.regs.scratch)); if (err) - return err; + return -EFAULT; set_current_blocked(&set); regs->bta = uregs.scratch.bta; -- 2.30.2 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 96705C433B4 for ; Mon, 12 Apr 2021 16:26:07 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 47075613AB for ; Mon, 12 Apr 2021 16:26:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 47075613AB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-snps-arc-bounces+linux-snps-arc=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=9TRA2x4zGgnM9caC6Gml/L7fCxPpU79JC2z18izrsq0=; b=edPaTtX55Fx7ayA5/8/DJotCn KUgiJGXKaaAoChqdQmrsOOkvXphtuB6sBgj1/Yi6X4HrbzvNPedVts2EMPzmqmttdEA0Kh7GEns4X Loyze88OcWayH06V3K97cgwjbiLqmR6FpbE6EDwc2bsRFqs8XxYpzW/UAjXzlEr634VOj17wFh23k naPuo9yl0HcgOE1iC9yHkg7gMcC2/M1JLxAjGPgBgZ8dv+UwKMoiy5JqcoCV1L0uJ9lppR7NpV1x1 Juk8jRBBROfmI8ahkwKeJNin0JZcO/L47OVvrEzNSZoTzz7pTMs47ISQ8nGbFi5XZYmnThGinAY6L m2zo9pa0g==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lVzO1-007FTX-1O; Mon, 12 Apr 2021 16:26:05 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lVzNy-007FSQ-JG for linux-snps-arc@desiato.infradead.org; Mon, 12 Apr 2021 16:26:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=FcaCfgob7aiHQRVSjDbTPfvaB4OL2kS9xpgbnaSU+I8=; b=eSGO5npbtqkoapeywhyrUW6BHl ljmnIL8KVrVD/N23c7remIMLoOQeOAeE35PQawxq8WGFCuVCZBtNflIcnHj4LOLMnlRZutnT2ytSX fC9WBVWBl6y3chXIiVuPpcPo8uubVHAjWOSb1WWFxT8ksQn3fsRnb7PiddCExQWOemH1Ios4zVIaG OSCOa/tNjiPyP0fB83KspZZH1ZLtc7qimW1MlUhexvmVJ4skSzR+Vms7Q2ycSArIJ7QCi2++B2VS8 dbi2jcyNqLBZ0thTvxq7kAXDu1+x6+ZfcRQu23ycDeCoUArXmefYoJG0Zcs0SAjQvF1NzxFx5WaUw rRuwsvzg==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lVzNw-006OXx-7M for linux-snps-arc@lists.infradead.org; Mon, 12 Apr 2021 16:26:01 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 474C76139C; Mon, 12 Apr 2021 16:25:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618244759; bh=wQmhuzaCHK+pZWUvY/gW8zm0lQr9CrxBVVbOKseXz0M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AJVlgUb+NRcWK9aaFy19WIPNDPYkSoeBGLPug83HYVP7deJbd6olatU3BYxi4yY3F KbQiolF/Ln8kqfdi6q3sgxubhJQFvFfOLSqDBFWL+yw3p3a7Ilss8tXzUr3/8LiYot HVx+NJs4NoA6eruCxj8zzrEHTeSAV1s8S006VpjJm2m5tsI5l6iKMDL7JKghCZjy0r n97X9ToSYTMi28d/IjibNl+zYvu2kh8KP0pkwXwzLnnvS+ROETHoNaHjkTw5uAkDSr j7LassIdsorzQJPlyZaGcrF8cztBcANKH6kTVILVL7StFfN6JK2CgwpmJOGIN9WAIT V2Fec8UlKD/vA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wang Qing , Vineet Gupta , Sasha Levin , linux-snps-arc@lists.infradead.org Subject: [PATCH AUTOSEL 4.19 05/28] arc: kernel: Return -EFAULT if copy_to_user() fails Date: Mon, 12 Apr 2021 12:25:30 -0400 Message-Id: <20210412162553.315227-5-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210412162553.315227-1-sashal@kernel.org> References: <20210412162553.315227-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210412_092600_303724_5F1C0421 X-CRM114-Status: UNSURE ( 9.44 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-snps-arc@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux on Synopsys ARC Processors List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-snps-arc" Errors-To: linux-snps-arc-bounces+linux-snps-arc=archiver.kernel.org@lists.infradead.org From: Wang Qing [ Upstream commit 46e152186cd89d940b26726fff11eb3f4935b45a ] 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. Signed-off-by: Wang Qing Signed-off-by: Vineet Gupta Signed-off-by: Sasha Levin --- arch/arc/kernel/signal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arc/kernel/signal.c b/arch/arc/kernel/signal.c index 48685445002e..da243420bcb5 100644 --- a/arch/arc/kernel/signal.c +++ b/arch/arc/kernel/signal.c @@ -99,7 +99,7 @@ stash_usr_regs(struct rt_sigframe __user *sf, struct pt_regs *regs, sizeof(sf->uc.uc_mcontext.regs.scratch)); err |= __copy_to_user(&sf->uc.uc_sigmask, set, sizeof(sigset_t)); - return err; + return err ? -EFAULT : 0; } static int restore_usr_regs(struct pt_regs *regs, struct rt_sigframe __user *sf) @@ -113,7 +113,7 @@ static int restore_usr_regs(struct pt_regs *regs, struct rt_sigframe __user *sf) &(sf->uc.uc_mcontext.regs.scratch), sizeof(sf->uc.uc_mcontext.regs.scratch)); if (err) - return err; + return -EFAULT; set_current_blocked(&set); regs->bta = uregs.scratch.bta; -- 2.30.2 _______________________________________________ linux-snps-arc mailing list linux-snps-arc@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-snps-arc