linux-kernel - Re: [PATCH V2] selftests/cgroup: Fix build on older distros

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <50cb30c4-8e8d-7ba0-d429-3f1da4ad1f0b@linuxfoundation.org>
Date:   Tue, 10 Nov 2020 15:15:15 -0700
From:   Shuah Khan <skhan@...uxfoundation.org>
To:     Sachin Sant <sachinp@...ux.vnet.ibm.com>,
        Michael Ellerman <michael@...erman.id.au>,
        linux-kselftest@...r.kernel.org
Cc:     christian@...uner.io, linux-kernel@...r.kernel.org,
        keescook@...omium.org, Shuah Khan <skhan@...uxfoundation.org>
Subject: Re: [PATCH V2] selftests/cgroup: Fix build on older distros

On 11/6/20 12:40 AM, Sachin Sant wrote:
> On older distros struct clone_args does not have a cgroup member,
> leading to build errors:
> 
>   cgroup_util.c: In function 'clone_into_cgroup':
>   cgroup_util.c:343:4: error: 'struct clone_args' has no member named 'cgroup'
>   cgroup_util.c:346:33: error: invalid application of 'sizeof' to incomplete
>    type 'struct clone_args'
> 
> But the selftests already have a locally defined version of the
> structure which is up to date, called __clone_args.
> 
> So use __clone_args which fixes the error.
> 
> Signed-off-by: Michael Ellerman <mpe@...erman.id.au>
> Signed-off-by: Sachin Sant <sachinp@...ux.vnet.ibm.com>>
> Acked-by: Christian Brauner <christian.brauner@...ntu.com>
> ---
> 
> V2: Replace all instances of clone_args by __clone_args
> ---
> 
> diff --git a/a/tools/testing/selftests/cgroup/cgroup_util.c b/b/tools/testing/selftests/cgroup/cgroup_util.c
> index 05853b0..0270146 100644
> --- a/a/tools/testing/selftests/cgroup/cgroup_util.c
> +++ b/b/tools/testing/selftests/cgroup/cgroup_util.c
> @@ -337,13 +337,13 @@ pid_t clone_into_cgroup(int cgroup_fd)
>   #ifdef CLONE_ARGS_SIZE_VER2
>   	pid_t pid;
>   
> -	struct clone_args args = {
> +	struct __clone_args args = {
>   		.flags = CLONE_INTO_CGROUP,
>   		.exit_signal = SIGCHLD,
>   		.cgroup = cgroup_fd,
>   	};
>   
> -	pid = sys_clone3(&args, sizeof(struct clone_args));
> +	pid = sys_clone3(&args, sizeof(struct __clone_args));
>   	/*
>   	 * Verify that this is a genuine test failure:
>   	 * ENOSYS -> clone3() not available
> 

Not sure how you generated the patch. I had to use git am -p2

Applied to linux-kselftest next - please make sure to generate from
top level.

thanks,
-- Shuah