From nobody Tue Sep 9 00:02:22 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B78CAC6FA8E for ; Fri, 24 Feb 2023 23:31:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229561AbjBXXbx (ORCPT ); Fri, 24 Feb 2023 18:31:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229557AbjBXXbu (ORCPT ); Fri, 24 Feb 2023 18:31:50 -0500 Received: from mail-pj1-x1042.google.com (mail-pj1-x1042.google.com [IPv6:2607:f8b0:4864:20::1042]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C01B6F40F; Fri, 24 Feb 2023 15:31:48 -0800 (PST) Received: by mail-pj1-x1042.google.com with SMTP id oe18-20020a17090b395200b00236a0d55d3aso814814pjb.3; Fri, 24 Feb 2023 15:31:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CdtGqct+MwH2EWhlTBd073J94ebfBu7k+yd8Ehy7SG8=; b=KJUGYPJkw++2Ec8nWAcnbODOkT6CGK+Nd+kT6OGag0WIlSNZfsYMvhJIYaiUmfypc8 dasmuiFarZF4qDESqKlasnTWt+tdzhduM3Ewm7q7oOkmlUTeETpPWiXLZ9NNgz70sHF3 gPj/HHPPHHfzOcUmys15QUut2/GEN+otj1GJILDtIzP8k1yJF4vRnyT1Tp1kPMzNO+n+ 83kYcAI2iLzvsBPN3PFlPBpbS9z/lySijKTefnw+TOrNZxstX8YRV1iOusaJezDiFlOu pXEd4ig6Dr8vFNn83jq9zXmEEGow6ATxksTzcR+Z8DK6+xemriIIMfvGjNz4vWyfhnyx UqoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CdtGqct+MwH2EWhlTBd073J94ebfBu7k+yd8Ehy7SG8=; b=7Vp5lyws2DRkzX5o4vGhnlt1ZUa8SrTrv1MBvUN8i/El6bC3865WiXyZrjsxCsysEf no4F/WftwwB0b12tRTmP3k/YoCczb4locGxGdqkinxgCcm9bhTaaKcWn4qq0g6hG3E8x TOn8Vilm6z82+o9p7byX7ZiMVP5pkXRRCs4KQAQaWCCxVt/xDVm8JRcfAjX0VP6nBDbD x1JmzFE9qilI30XLwyhv/ucoZDV6uspxAVj3q2zBkBUrUwr7Rd43xXQv7Hg8lRyaC8Pt fgQFYvPO/cntAdQUyUKnKYaAUKtI0/aUCg9zNLxZmMQtASOxh75cGSVckaFvVApOcWIo caPw== X-Gm-Message-State: AO0yUKXKZuzBcQbI5ioNjSuKe3N+6RBle4x/11pFWXpxVGBxGiZ3W4+w eH9rNgcJOBw5gqN3yzCGZlRLDcMp8FgL X-Google-Smtp-Source: AK7set+wN+Fbn1LUoT7s7KSSaf/NWiADYACdCCyzrNNFE5gIGfQ/WP9rPmbnmVwna8nEWvMJBY8lYQ== X-Received: by 2002:a17:903:707:b0:19c:eaa1:edd8 with SMTP id kk7-20020a170903070700b0019ceaa1edd8mr631103plb.12.1677281507731; Fri, 24 Feb 2023 15:31:47 -0800 (PST) Received: from fedora.mshome.net ([104.184.156.161]) by smtp.gmail.com with ESMTPSA id g2-20020a170902868200b0019a5aa7eab0sm59680plo.54.2023.02.24.15.31.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Feb 2023 15:31:47 -0800 (PST) From: Gregory Price X-Google-Original-From: Gregory Price To: linux-kernel@vger.kernel.org Cc: linux-doc@vger.kernel.org, oleg@redhat.com, avagin@gmail.com, peterz@infradead.org, luto@kernel.org, krisman@collabora.com, tglx@linutronix.de, corbet@lwn.net, shuah@kernel.org, Gregory Price Subject: [PATCH v12 1/3] syscall_user_dispatch: helper function to operate on given task Date: Fri, 24 Feb 2023 18:31:24 -0500 Message-Id: <20230224233126.1936-2-gregory.price@memverge.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230224233126.1936-1-gregory.price@memverge.com> References: <20230224233126.1936-1-gregory.price@memverge.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Preparatory patch ahead of set/get interfaces which will allow a ptrace to get/set the syscall user dispatch configuration of a task. This will simplify the set interface and consolidates error paths. Signed-off-by: Gregory Price --- kernel/entry/syscall_user_dispatch.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/kernel/entry/syscall_user_dispatch.c b/kernel/entry/syscall_us= er_dispatch.c index 0b6379adff6b..22396b234854 100644 --- a/kernel/entry/syscall_user_dispatch.c +++ b/kernel/entry/syscall_user_dispatch.c @@ -68,8 +68,9 @@ bool syscall_user_dispatch(struct pt_regs *regs) return true; } =20 -int set_syscall_user_dispatch(unsigned long mode, unsigned long offset, - unsigned long len, char __user *selector) +static int task_set_syscall_user_dispatch(struct task_struct *task, unsign= ed long mode, + unsigned long offset, unsigned long len, + char __user *selector) { switch (mode) { case PR_SYS_DISPATCH_OFF: @@ -94,15 +95,21 @@ int set_syscall_user_dispatch(unsigned long mode, unsig= ned long offset, return -EINVAL; } =20 - current->syscall_dispatch.selector =3D selector; - current->syscall_dispatch.offset =3D offset; - current->syscall_dispatch.len =3D len; - current->syscall_dispatch.on_dispatch =3D false; + task->syscall_dispatch.selector =3D selector; + task->syscall_dispatch.offset =3D offset; + task->syscall_dispatch.len =3D len; + task->syscall_dispatch.on_dispatch =3D false; =20 if (mode =3D=3D PR_SYS_DISPATCH_ON) - set_syscall_work(SYSCALL_USER_DISPATCH); + set_task_syscall_work(task, SYSCALL_USER_DISPATCH); else - clear_syscall_work(SYSCALL_USER_DISPATCH); + clear_task_syscall_work(task, SYSCALL_USER_DISPATCH); =20 return 0; } + +int set_syscall_user_dispatch(unsigned long mode, unsigned long offset, + unsigned long len, char __user *selector) +{ + return task_set_syscall_user_dispatch(current, mode, offset, len, selecto= r); +} --=20 2.39.1 From nobody Tue Sep 9 00:02:22 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94863C7EE23 for ; Fri, 24 Feb 2023 23:32:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229578AbjBXXcF (ORCPT ); Fri, 24 Feb 2023 18:32:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229454AbjBXXcD (ORCPT ); Fri, 24 Feb 2023 18:32:03 -0500 Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD8CA6F821; Fri, 24 Feb 2023 15:31:55 -0800 (PST) Received: by mail-pl1-x642.google.com with SMTP id i10so1080907plr.9; Fri, 24 Feb 2023 15:31:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PxZBF0SmrCMO4Iwad1t9r0AlJbORhecxHnTRuEY3+uM=; b=OcBzGxtyAk6p2nVoKHvkpejxIqQ8sMYWvkOvAbbDVxxbGqX5onk9jVYlq6FKshBzrw 6Rrg4NI6R/a9ErjZyONleGTE1YDflJfbjiW1F81+CTgX6TvsBrks/Fuk/W4cUCXIVB6N YHcMmjuRmofs1/0pY13DOVQhdAiOeM2/d/tma8JHHULl6axaD6bQ65jGGgtYpfRDEp7Z 0UkxuozLhIyIUqOF0dXl9xSVUtcQZgcDjg1SFTKZpySxG62ITm0HXaDLm/D1qG0bVsRC f9cC6r7az9eHsVJ+9UapFgWnkzd+p85a6hRxTrdEFX7CgdGswV6GXh5pyVsG9MxkL+hE cLRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PxZBF0SmrCMO4Iwad1t9r0AlJbORhecxHnTRuEY3+uM=; b=VW3v5yvHEbC0xcpF6cKLaPDDVFjW9bTYmxcqo7anjBD0n1vc6l1iK1oe55qZnIxmMW PKGOj2UD1X6cvwpGiJYDQUqg7NWnAmtIF0uGyR1RktTx3lr8oWZuqpZGSdg9MPGK3WMy 7k9+am+A+i2tOU/IzsH8UusQO85RJP+APbQoxDlc4VWEUIgSMVu0RfQP5yvsjsrDU0d5 RifGgPh/2UIPAF+Be8f9DjEYWTPX+NLwMohFufzDoy8e2ozUZBRF5MdfJWCpMNCXl7fp XqY8hHkN4rF7vq5s54qLzS+lQkKFfOZledYWYwWTHJ5/ju1v9NIZiqFG7mzhJDEygBUg yDvg== X-Gm-Message-State: AO0yUKVcbmWhXVf+Joh0MgKe9NYJCLZzjHeISjqcpWQ2gDt4c4O5W08G qXK+EoZkv7x2DdoFQldF0W5wUZnqwofh X-Google-Smtp-Source: AK7set9GFzimTWNnGuiPv15uJYyJGXgjmVec0dPPJEaGr0pOH0XMkLoWnEsrET3FDLj3fygCWe5E4w== X-Received: by 2002:a17:903:230f:b0:19a:96f9:f55b with SMTP id d15-20020a170903230f00b0019a96f9f55bmr23847152plh.27.1677281515144; Fri, 24 Feb 2023 15:31:55 -0800 (PST) Received: from fedora.mshome.net ([104.184.156.161]) by smtp.gmail.com with ESMTPSA id g2-20020a170902868200b0019a5aa7eab0sm59680plo.54.2023.02.24.15.31.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Feb 2023 15:31:54 -0800 (PST) From: Gregory Price X-Google-Original-From: Gregory Price To: linux-kernel@vger.kernel.org Cc: linux-doc@vger.kernel.org, oleg@redhat.com, avagin@gmail.com, peterz@infradead.org, luto@kernel.org, krisman@collabora.com, tglx@linutronix.de, corbet@lwn.net, shuah@kernel.org, Gregory Price Subject: [PATCH v12 2/3] ptrace,syscall_user_dispatch: checkpoint/restore support for SUD Date: Fri, 24 Feb 2023 18:31:25 -0500 Message-Id: <20230224233126.1936-3-gregory.price@memverge.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230224233126.1936-1-gregory.price@memverge.com> References: <20230224233126.1936-1-gregory.price@memverge.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Implement ptrace getter/setter interface for syscall user dispatch. These prctl settings are presently write-only, making it impossible to implement transparent checkpoint/restore via software like CRIU. 'on_dispatch' field is not exposed because it is a kernel-internal only field that cannot be 'true' when returning to userland. Signed-off-by: Gregory Price --- .../admin-guide/syscall-user-dispatch.rst | 4 ++ include/linux/syscall_user_dispatch.h | 18 ++++++++ include/uapi/linux/ptrace.h | 29 +++++++++++++ kernel/entry/syscall_user_dispatch.c | 42 +++++++++++++++++++ kernel/ptrace.c | 9 ++++ 5 files changed, 102 insertions(+) diff --git a/Documentation/admin-guide/syscall-user-dispatch.rst b/Document= ation/admin-guide/syscall-user-dispatch.rst index 60314953c728..f7648c08297e 100644 --- a/Documentation/admin-guide/syscall-user-dispatch.rst +++ b/Documentation/admin-guide/syscall-user-dispatch.rst @@ -73,6 +73,10 @@ thread-wide, without the need to invoke the kernel direc= tly. selector can be set to SYSCALL_DISPATCH_FILTER_ALLOW or SYSCALL_DISPATCH_FILTER_BLO= CK. Any other value should terminate the program with a SIGSYS. =20 +Additionally, a task's syscall user dispatch configuration can be peeked +and poked via the PTRACE_(GET|SET)_SYSCALL_USER_DISPATCH_CONFIG ptrace +requests. This is useful for checkpoint/restart software. + Security Notes -------------- =20 diff --git a/include/linux/syscall_user_dispatch.h b/include/linux/syscall_= user_dispatch.h index a0ae443fb7df..641ca8880995 100644 --- a/include/linux/syscall_user_dispatch.h +++ b/include/linux/syscall_user_dispatch.h @@ -22,6 +22,12 @@ int set_syscall_user_dispatch(unsigned long mode, unsign= ed long offset, #define clear_syscall_work_syscall_user_dispatch(tsk) \ clear_task_syscall_work(tsk, SYSCALL_USER_DISPATCH) =20 +int syscall_user_dispatch_get_config(struct task_struct *task, unsigned lo= ng size, + void __user *data); + +int syscall_user_dispatch_set_config(struct task_struct *task, unsigned lo= ng size, + void __user *data); + #else struct syscall_user_dispatch {}; =20 @@ -35,6 +41,18 @@ static inline void clear_syscall_work_syscall_user_dispa= tch(struct task_struct * { } =20 +static inline int syscall_user_dispatch_get_config(struct task_struct *tas= k, + unsigned long size, void __user *data) +{ + return -EINVAL; +} + +static inline int syscall_user_dispatch_set_config(struct task_struct *tas= k, + unsigned long size, void __user *data) +{ + return -EINVAL; +} + #endif /* CONFIG_GENERIC_ENTRY */ =20 #endif /* _SYSCALL_USER_DISPATCH_H */ diff --git a/include/uapi/linux/ptrace.h b/include/uapi/linux/ptrace.h index 195ae64a8c87..1e77b02344c3 100644 --- a/include/uapi/linux/ptrace.h +++ b/include/uapi/linux/ptrace.h @@ -112,6 +112,35 @@ struct ptrace_rseq_configuration { __u32 pad; }; =20 +#define PTRACE_SET_SYSCALL_USER_DISPATCH_CONFIG 0x4210 +#define PTRACE_GET_SYSCALL_USER_DISPATCH_CONFIG 0x4211 + +/* + * struct ptrace_sud_config - Per-task configuration for SUD + * @mode: One of PR_SYS_DISPATCH_ON or PR_SYS_DISPATCH_OFF + * @selector: Tracee's user virtual address of SUD selector + * @offset: SUD exclusion area (virtual address) + * @len: Length of SUD exclusion area + * + * Used to get/set the syscall user dispatch configuration for tracee. + * process. Selector is optional (may be NULL), and if invalid will produ= ce + * a SIGSEGV in the tracee upon first access. + * + * If mode is PR_SYS_DISPATCH_ON, syscall dispatch will be enabled. If + * PR_SYS_DISPATCH_OFF, syscall dispatch will be disabled and all other + * parameters must be 0. The value in *selector (if not null), also deter= mines + * whether syscall dispatch will occur. + * + * The SUD Exclusion area described by offset/len is the virtual address s= pace + * from which syscalls will not produce a user dispatch. + */ +struct ptrace_sud_config { + __u64 mode; + __u64 selector; + __u64 offset; + __u64 len; +}; + /* * These values are stored in task->ptrace_message * by ptrace_stop to describe the current syscall-stop. diff --git a/kernel/entry/syscall_user_dispatch.c b/kernel/entry/syscall_us= er_dispatch.c index 22396b234854..95b7218be71d 100644 --- a/kernel/entry/syscall_user_dispatch.c +++ b/kernel/entry/syscall_user_dispatch.c @@ -4,6 +4,7 @@ */ #include #include +#include #include #include #include @@ -113,3 +114,44 @@ int set_syscall_user_dispatch(unsigned long mode, unsi= gned long offset, { return task_set_syscall_user_dispatch(current, mode, offset, len, selecto= r); } + +int syscall_user_dispatch_get_config(struct task_struct *task, unsigned lo= ng size, + void __user *data) +{ + struct syscall_user_dispatch *sd =3D &task->syscall_dispatch; + struct ptrace_sud_config config; + + if (size !=3D sizeof(struct ptrace_sud_config)) + return -EINVAL; + + if (test_task_syscall_work(task, SYSCALL_USER_DISPATCH)) + config.mode =3D PR_SYS_DISPATCH_ON; + else + config.mode =3D PR_SYS_DISPATCH_OFF; + + config.offset =3D sd->offset; + config.len =3D sd->len; + config.selector =3D (__u64)(uintptr_t)sd->selector; + + if (copy_to_user(data, &config, sizeof(config))) + return -EFAULT; + + return 0; +} + +int syscall_user_dispatch_set_config(struct task_struct *task, unsigned lo= ng size, + void __user *data) +{ + int rc; + struct ptrace_sud_config cfg; + + if (size !=3D sizeof(struct ptrace_sud_config)) + return -EINVAL; + + if (copy_from_user(&cfg, data, sizeof(struct ptrace_sud_config))) + return -EFAULT; + + rc =3D task_set_syscall_user_dispatch(task, cfg.mode, cfg.offset, + cfg.len, (char __user *)(uintptr_t)cfg.selector); + return rc; +} diff --git a/kernel/ptrace.c b/kernel/ptrace.c index 0786450074c1..443057bee87c 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -32,6 +32,7 @@ #include #include #include +#include =20 #include /* for syscall_get_* */ =20 @@ -1259,6 +1260,14 @@ int ptrace_request(struct task_struct *child, long r= equest, break; #endif =20 + case PTRACE_SET_SYSCALL_USER_DISPATCH_CONFIG: + ret =3D syscall_user_dispatch_set_config(child, addr, datavp); + break; + + case PTRACE_GET_SYSCALL_USER_DISPATCH_CONFIG: + ret =3D syscall_user_dispatch_get_config(child, addr, datavp); + break; + default: break; } --=20 2.39.1 From nobody Tue Sep 9 00:02:22 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 736DAC7EE23 for ; Fri, 24 Feb 2023 23:32:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229585AbjBXXcX (ORCPT ); Fri, 24 Feb 2023 18:32:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33942 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229512AbjBXXcU (ORCPT ); Fri, 24 Feb 2023 18:32:20 -0500 Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBDB76F010; Fri, 24 Feb 2023 15:32:02 -0800 (PST) Received: by mail-pl1-x644.google.com with SMTP id bh1so1068054plb.11; Fri, 24 Feb 2023 15:32:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ogl86awpdsmdZqeffQnskO7M/1aafsTEVLhtpf3qa4Y=; b=o1JFEmoEEsE819cu2a+6E17o8mG1i8Hu1t+bGf8JtGPbKJpOluiPKHiTPbBl9/D6ZE ng0lGy4q+bnKaOB5WCoe7lqfpa05+o57KfZkskTYZ7IhEe8PtWrOcV6niRUELjhyeIQV T8VowftRoJaR6ESg7n10bnw03d3uVMmuPQGG4sdeaKmEVTztOhw0ESohOrj9utGbnK7d 0D7RSu6WRCRAPVAoxMXGL7Co7ZjDZv3NNBdK7Ffr40FzlY9R41byJO6bUh8/fReyOVKU FjI6fzCL6VidT74KI90k9v87+TUttnBH2U9ly4cnTTBQhPG/Nzc1HyFSApWD+S1oq42s rrwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ogl86awpdsmdZqeffQnskO7M/1aafsTEVLhtpf3qa4Y=; b=WVtqxwxg5CH2aKB2dycLeLysqWcajiOmvzdtPz9VQQGxcETVxj5BlfdLDEY7Uzh0GW RKehAuqXBcBielxcDZ101SarfO9FwkbJP9qk+p7/Ug+mtI88Rbm4GhlVp7Z19YgvFKB9 XkWsL+14e985V2KKGm3fpWSGPhf7NyT67z7f4N4HkacE5TExMop4OVonKx2SyEGkU+V9 R9NRP15FxRWlV4cKXT1oIFcXtrLwdPPoFeVc5MB2s20FwJ+saLR0yXxf96vu3w+jL+F7 OdKcAOeVv85zw7eLD1uZif2xYxif+uqfHCqpiraEnK6rAB0Cowb3PmuQojiCUmhAejg2 nQwA== X-Gm-Message-State: AO0yUKU9Ls9SV3BXOPAoEH+e4271beO++f6QR5id7l13TeRnL5KxqrtQ +bgkWZl7qRGbgdCtQIp4/kN/s54pwxGV X-Google-Smtp-Source: AK7set8I6VGYRH8kCoKGDb7Ha8xxPGIp4IR31x6yP24z2bLjEddpmPa6d6Ngb9E6JjJCHBmXICQAYw== X-Received: by 2002:a17:902:c406:b0:19a:8fb9:5af1 with SMTP id k6-20020a170902c40600b0019a8fb95af1mr22520532plk.36.1677281522244; Fri, 24 Feb 2023 15:32:02 -0800 (PST) Received: from fedora.mshome.net ([104.184.156.161]) by smtp.gmail.com with ESMTPSA id g2-20020a170902868200b0019a5aa7eab0sm59680plo.54.2023.02.24.15.31.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Feb 2023 15:32:02 -0800 (PST) From: Gregory Price X-Google-Original-From: Gregory Price To: linux-kernel@vger.kernel.org Cc: linux-doc@vger.kernel.org, oleg@redhat.com, avagin@gmail.com, peterz@infradead.org, luto@kernel.org, krisman@collabora.com, tglx@linutronix.de, corbet@lwn.net, shuah@kernel.org, Gregory Price Subject: [PATCH v12 3/3] selftest,ptrace: Add selftest for syscall user dispatch config api Date: Fri, 24 Feb 2023 18:31:26 -0500 Message-Id: <20230224233126.1936-4-gregory.price@memverge.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230224233126.1936-1-gregory.price@memverge.com> References: <20230224233126.1936-1-gregory.price@memverge.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Validate that the following new ptrace requests work as expected * PTRACE_GET_SYSCALL_USER_DISPATCH_CONFIG - returns the contents of task->syscall_dispatch if enabled * PTRACE_SET_SYSCALL_USER_DISPATCH_CONFIG - sets the contents of task->syscall_dispatch Signed-off-by: Gregory Price --- tools/testing/selftests/ptrace/.gitignore | 1 + tools/testing/selftests/ptrace/Makefile | 2 +- tools/testing/selftests/ptrace/get_set_sud.c | 72 ++++++++++++++++++++ 3 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/ptrace/get_set_sud.c diff --git a/tools/testing/selftests/ptrace/.gitignore b/tools/testing/self= tests/ptrace/.gitignore index 792318aaa30c..b7dde152e75a 100644 --- a/tools/testing/selftests/ptrace/.gitignore +++ b/tools/testing/selftests/ptrace/.gitignore @@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only get_syscall_info +get_set_sud peeksiginfo vmaccess diff --git a/tools/testing/selftests/ptrace/Makefile b/tools/testing/selfte= sts/ptrace/Makefile index 96ffa94afb91..1c631740a730 100644 --- a/tools/testing/selftests/ptrace/Makefile +++ b/tools/testing/selftests/ptrace/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only CFLAGS +=3D -std=3Dc99 -pthread -Wall $(KHDR_INCLUDES) =20 -TEST_GEN_PROGS :=3D get_syscall_info peeksiginfo vmaccess +TEST_GEN_PROGS :=3D get_syscall_info peeksiginfo vmaccess get_set_sud =20 include ../lib.mk diff --git a/tools/testing/selftests/ptrace/get_set_sud.c b/tools/testing/s= elftests/ptrace/get_set_sud.c new file mode 100644 index 000000000000..5297b10d25c3 --- /dev/null +++ b/tools/testing/selftests/ptrace/get_set_sud.c @@ -0,0 +1,72 @@ +// SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE +#include "../kselftest_harness.h" +#include +#include +#include +#include +#include +#include + +#include "linux/ptrace.h" + +static int sys_ptrace(int request, pid_t pid, void *addr, void *data) +{ + return syscall(SYS_ptrace, request, pid, addr, data); +} + +TEST(get_set_sud) +{ + struct ptrace_sud_config config; + pid_t child; + int ret =3D 0; + int status; + + child =3D fork(); + ASSERT_GE(child, 0); + if (child =3D=3D 0) { + ASSERT_EQ(0, sys_ptrace(PTRACE_TRACEME, 0, 0, 0)) { + TH_LOG("PTRACE_TRACEME: %m"); + } + kill(getpid(), SIGSTOP); + _exit(1); + } + + waitpid(child, &status, 0); + + memset(&config, 0xff, sizeof(config)); + config.mode =3D PR_SYS_DISPATCH_ON; + + ret =3D sys_ptrace(PTRACE_GET_SYSCALL_USER_DISPATCH_CONFIG, child, + (void *)sizeof(config), &config); + + ASSERT_EQ(ret, 0); + ASSERT_EQ(config.mode, PR_SYS_DISPATCH_OFF); + ASSERT_EQ(config.selector, 0); + ASSERT_EQ(config.offset, 0); + ASSERT_EQ(config.len, 0); + + config.mode =3D PR_SYS_DISPATCH_ON; + config.selector =3D 0; + config.offset =3D 0x400000; + config.len =3D 0x1000; + + ret =3D sys_ptrace(PTRACE_SET_SYSCALL_USER_DISPATCH_CONFIG, child, + (void *)sizeof(config), &config); + + ASSERT_EQ(ret, 0); + + memset(&config, 1, sizeof(config)); + ret =3D sys_ptrace(PTRACE_GET_SYSCALL_USER_DISPATCH_CONFIG, child, + (void *)sizeof(config), &config); + + ASSERT_EQ(ret, 0); + ASSERT_EQ(config.mode, PR_SYS_DISPATCH_ON); + ASSERT_EQ(config.selector, 0); + ASSERT_EQ(config.offset, 0x400000); + ASSERT_EQ(config.len, 0x1000); + + kill(child, SIGKILL); +} + +TEST_HARNESS_MAIN --=20 2.39.1