From patchwork Thu Nov 10 08:56:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alban Crequy X-Patchwork-Id: 18017 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp28414wru; Thu, 10 Nov 2022 00:57:18 -0800 (PST) X-Google-Smtp-Source: AMsMyM45XcMeda9fHGyol3VuYz1psR5cSVVSIc2YtfCYg7mym8T10z4Z7uEVLIe7LCBOUTDw5lVs X-Received: by 2002:a05:6a00:1c82:b0:562:7bed:9676 with SMTP id y2-20020a056a001c8200b005627bed9676mr2181048pfw.13.1668070637802; Thu, 10 Nov 2022 00:57:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668070637; cv=none; d=google.com; s=arc-20160816; b=lSdizmgFf5r6YOQORtbTB6A0N2pH/X55DPU+hfkECTu6Ga7aMuSBeqSwEM8q7BalzT Q9bvYyuPQnGXFsktB5TJZ0QHhZ8m+HuIae6MlFtLvpk7CSSRcTnbUhA1pbzU1dljB2Dc YRge3SFCwwfd6Qc8XO1SAbV+uQxyHd8QuB0ebVO/k/1EiJDHWufM4f6MPW+HvGneXDvF ub1yLM634GfEfmp8tyudRJJDtSZaG/bihtdFT1np1z5uV18vTfMuHmvPAzVmYLhOJXb4 VtWzYDhJCygIlwMtyg2jrRVnbH6cuwSIOHdQg/vaCMYtsY8h7S8JGywT86dnwZzuW2FG r6tw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=GmmcWRHXej2dQfvPtFxEWyzjKiiDadj2sFvtiycrCxE=; b=gBVDvjvtp132A7uARM3jm2OXB/JOk9ZnBPzMoeoltLHAW87yG0aur/iptvv4m33s0X HVWXSmfslitIeuS0Qe2clFXp5ddV515i7v80okTBiNLDWzBeZs2ecQtpU4g/Uxpnh+q2 LxMzfzbu/eukvgg0gYLs1T5JhK2G4UGeckwoOaVgrKODtTuRRtL/dLP6DGlpItSk5OWX lzpZ5dzQWHDZQlIaopSwFUtiGhKZ1gAOdnJpdUxHpi6ZqD/op7REr6piVaSViFEmr+Hk 05BL0G+lPJeMPeFuq5WuNRFEnGuhBbkipStnljoKK8NWWfLnPa9mM0jXVDpCLj+ugGof R6Xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=ReyQjGm7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z9-20020a170903018900b0018668e41784si22978616plg.13.2022.11.10.00.57.03; Thu, 10 Nov 2022 00:57:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=ReyQjGm7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229492AbiKJI4r (ORCPT + 99 others); Thu, 10 Nov 2022 03:56:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229667AbiKJI4n (ORCPT ); Thu, 10 Nov 2022 03:56:43 -0500 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id EEA5A40912; Thu, 10 Nov 2022 00:56:42 -0800 (PST) Received: from neptune.. (ip5f592f1a.dynamic.kabel-deutschland.de [95.89.47.26]) by linux.microsoft.com (Postfix) with ESMTPSA id 5F1F520E67BB; Thu, 10 Nov 2022 00:56:38 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 5F1F520E67BB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1668070602; bh=GmmcWRHXej2dQfvPtFxEWyzjKiiDadj2sFvtiycrCxE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ReyQjGm7vcTT5+EjufyZiuYxT3zEfu/hTGvQWVZ92UX8yY08quVAEEli7XHPUthHf oApL7sM0Xh/X4wP2quDfqW+lqR5FS6mamP608xvZ2/8K6VR2A289QbxueA23eoZPjZ RvasQusIguP7/J6k4RoRicSk4O9IuZAGqMhnBRqA= From: Alban Crequy To: bpf@vger.kernel.org Cc: stable@vger.kernel.org, albancrequy@linux.microsoft.com, flaniel@linux.microsoft.com, akpm@linux-foundation.org, andrii@kernel.org, ast@kernel.org, daniel@iogearbox.net, haoluo@google.com, john.fastabend@gmail.com, jolsa@kernel.org, kpsingh@kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, martin.lau@linux.dev, mykolal@fb.com, sdf@google.com, shuah@kernel.org, song@kernel.org, yhs@fb.com Subject: [PATCH bpf v2 1/2] maccess: fix writing offset in case of fault in strncpy_from_kernel_nofault() Date: Thu, 10 Nov 2022 09:56:13 +0100 Message-Id: <20221110085614.111213-2-albancrequy@linux.microsoft.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221110085614.111213-1-albancrequy@linux.microsoft.com> References: <20221110085614.111213-1-albancrequy@linux.microsoft.com> MIME-Version: 1.0 X-Spam-Status: No, score=-19.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,USER_IN_DEF_DKIM_WL,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749098837083249933?= X-GMAIL-MSGID: =?utf-8?q?1749098837083249933?= If a page fault occurs while copying the first byte, this function resets one byte before dst. As a consequence, an address could be modified and leaded to kernel crashes if case the modified address was accessed later. Fixes: b58294ead14c ("maccess: allow architectures to provide kernel probing directly") Cc: [5.8] Signed-off-by: Alban Crequy Tested-by: Francis Laniel Reviewed-by: Andrew Morton --- Changes v1 to v2: - add 'cc:stable', 'Fixes:' and review tag - fix my email - rebase on bpf tree and tag for bpf tree --- mm/maccess.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/maccess.c b/mm/maccess.c index 5f4d240f67ec..074f6b086671 100644 --- a/mm/maccess.c +++ b/mm/maccess.c @@ -97,7 +97,7 @@ long strncpy_from_kernel_nofault(char *dst, const void *unsafe_addr, long count) return src - unsafe_addr; Efault: pagefault_enable(); - dst[-1] = '\0'; + dst[0] = '\0'; return -EFAULT; }