From patchwork Wed Nov 2 13:06:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Desnoyers X-Patchwork-Id: 14222 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp3612522wru; Wed, 2 Nov 2022 06:16:26 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7RCilsb2qSuuCpTCXcUbyGMuA9tbfae0jo1E4wpUULFeraIwoxd5L1xg4cLFU7t0tTosDr X-Received: by 2002:a17:906:9be5:b0:7ad:d0be:3467 with SMTP id de37-20020a1709069be500b007add0be3467mr16438212ejc.208.1667394986747; Wed, 02 Nov 2022 06:16:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667394986; cv=none; d=google.com; s=arc-20160816; b=pI1z2q8Cm3KgJbzMOylsH7zEan9feQMR3E1+WA/vyT7w8aE81SmZFvN1n+34mAOu83 HYTaASDCsB2CKZx47mue+onGj4QtiKfKpMZ90r9y52IgHh4kmZySG9HbFtvIKbMZHG8l kpgvxFzog4lBmrfZTU2XvLZkxKHFV7086/RQOuJdQE+B6dUVFHz2Dom//vRWsUnlwU40 m58TRWhopzTix4TnEMgiyGkXSev1g3ZvkSWaBjEekzGUXL6l0Om6TfxSS0FNRTMi5/ll i9W33FJESewaGPPGSYJp77Os8oKl3AaSOClqjMAZAzsn0q0CfzN2vP40VInAPlJQjbvh wqGw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=Ivfy2CD66tHJyG8k47tfeLy1p+cUm/gn8/kxhCWzI7Y=; b=Zv3ylpORspzY7IkLaRYECwSuXQV56TKegZubEfMYwle6U3CuNTHkYh07Gbn6KKD2eE 47MCM5HUDc18xfRxBspMkHQubzp0h0M+vagpOvJ+69KALXXCx+tVS4b1eqiR5Tggz2O0 uOjvfgLhqF6r4ayySoQPURIjTwsxBvBjiWKJ+WHng8RS9oNGGenR9/eA1vjTZ2j6qgUn DJdI7gDM6fvmeD+5uQlLApXJ+2NCKH/Owy1Wb7G4TcnDnSUdMvqfqcsIjHMq9BwK3R+o x0kWufqMKMtNx0hkYSys7gULVpu02B41G4Q10ODI6sjcXNT6joYekopxMoxCJrEYjCJ0 CAag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@efficios.com header.s=smtpout1 header.b=E400qiJQ; 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=efficios.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g16-20020a1709065d1000b007a858ead526si11298712ejt.730.2022.11.02.06.16.02; Wed, 02 Nov 2022 06:16:26 -0700 (PDT) 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=@efficios.com header.s=smtpout1 header.b=E400qiJQ; 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=efficios.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231284AbiKBNGr (ORCPT + 99 others); Wed, 2 Nov 2022 09:06:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231269AbiKBNGn (ORCPT ); Wed, 2 Nov 2022 09:06:43 -0400 Received: from smtpout.efficios.com (smtpout.efficios.com [IPv6:2607:5300:203:5aae::31e5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A49EBCAE; Wed, 2 Nov 2022 06:06:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=efficios.com; s=smtpout1; t=1667394398; bh=BGBLi28IGb/j9Rsc8sOXjZnGnF7UAm518xzGIru/4uI=; h=From:To:Cc:Subject:Date:From; b=E400qiJQMQb/70O6znFxeZi92l/uqb80PsPOgXu3cvpXHsXWob/LCsWOnqePjlsoV OpAUYHN/JmjyNSGguieK/2hwDo7nn5gn/MnAeaWoSR7SbRPZ0v6nnU2sCfyrMUYxvV uyNBXx645mma6vnH8qOtLVf7LZh/kYfkWFxC2HFTv2qAcs/HhyheQtOy+daB8GEKIf R31nAD3B5pZhOQkMAnntr+9C9DGZmNia1+QA7gAyxSesFVjsxTBdgBVndkhfZWCtSY DAEoACQBtL5Cod5rQ4JJPyKTtpwI45wmyWwNfYmlQewJSixa0lNUJl7JjGWWmSFeZq iSA79j3rAhf4w== Received: from thinkos.internal.efficios.com (192-222-180-24.qc.cable.ebox.net [192.222.180.24]) by smtpout.efficios.com (Postfix) with ESMTPSA id 4N2Rwt4HwVzfTB; Wed, 2 Nov 2022 09:06:38 -0400 (EDT) From: Mathieu Desnoyers To: Peter Zijlstra Cc: linux-kernel@vger.kernel.org, Thomas Gleixner , "Paul E . McKenney" , Boqun Feng , "H . Peter Anvin" , Paul Turner , linux-api@vger.kernel.org, Peter Oskolkov , Mathieu Desnoyers , Mark Rutland Subject: [PATCH] rseq: Use pr_warn_once() when deprecated/unknown ABI flags are encountered Date: Wed, 2 Nov 2022 09:06:35 -0400 Message-Id: <20221102130635.7379-1-mathieu.desnoyers@efficios.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS 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?1748390365752330225?= X-GMAIL-MSGID: =?utf-8?q?1748390365752330225?= These commits use WARN_ON_ONCE() and kill the offending processes when deprecated and unknown flags are encountered: commit c17a6ff93213 ("rseq: Kill process when unknown flags are encountered in ABI structures") commit 0190e4198e47 ("rseq: Deprecate RSEQ_CS_FLAG_NO_RESTART_ON_* flags") The WARN_ON_ONCE() triggered by userspace input prevents use of Syzkaller to fuzz the rseq system call. Replace this WARN_ON_ONCE() by pr_warn_once() messages which contain actually useful information. Reported-by: Mark Rutland Signed-off-by: Mathieu Desnoyers Acked-by: Mark Rutland Acked-by: Paul E. McKenney --- kernel/rseq.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/kernel/rseq.c b/kernel/rseq.c index bda8175f8f99..d38ab944105d 100644 --- a/kernel/rseq.c +++ b/kernel/rseq.c @@ -171,12 +171,27 @@ static int rseq_get_rseq_cs(struct task_struct *t, struct rseq_cs *rseq_cs) return 0; } +static bool rseq_warn_flags(const char *str, u32 flags) +{ + u32 test_flags; + + if (!flags) + return false; + test_flags = flags & RSEQ_CS_NO_RESTART_FLAGS; + if (test_flags) + pr_warn_once("Deprecated flags (%u) in %s ABI structure", test_flags, str); + test_flags = flags & ~RSEQ_CS_NO_RESTART_FLAGS; + if (test_flags) + pr_warn_once("Unknown flags (%u) in %s ABI structure", test_flags, str); + return true; +} + static int rseq_need_restart(struct task_struct *t, u32 cs_flags) { u32 flags, event_mask; int ret; - if (WARN_ON_ONCE(cs_flags & RSEQ_CS_NO_RESTART_FLAGS) || cs_flags) + if (rseq_warn_flags("rseq_cs", cs_flags)) return -EINVAL; /* Get thread flags. */ @@ -184,7 +199,7 @@ static int rseq_need_restart(struct task_struct *t, u32 cs_flags) if (ret) return ret; - if (WARN_ON_ONCE(flags & RSEQ_CS_NO_RESTART_FLAGS) || flags) + if (rseq_warn_flags("rseq", flags)) return -EINVAL; /*