Re: [SRU][F][PATCH 1/1] UBUNTU: SAUCE: selftests/seccomp: fix 'storage size of ‘md’ isn’t known' build issue

[Stefan Bader]

On 26.10.21 19:19, Luke Nowakowski-Krijger wrote:
> BugLink: https://bugs.launchpad.net/bugs/1896420
> 
> There is a build issue on Bionic/5.4 kernels due to
> PTRACE_SECCOMP_GET_METADATA being defined in glibc header sys/ptrace.h,
> which then stops struct seccomp_metadata from being defined leading to:
> seccomp_bpf.c:3028:26: error: storage size of ‘md’ isn’t known
> 
> The solution here is to unconditonally define the seccomp_metadata
> definition that we need, and remove the linux/ptrace.h header where a
> definition of seccomp_metadata exists in Focal.
> 
> Signed-off-by: Luke Nowakowski-Krijger <luke.nowakowskikrijger at canonical.com>
> ---

This is a general problem we have with HWE kernels. The global C headers are 
what the base kernel supports (4.15 for bionic). The way this is changed would 
lock the definition to something seperate from the 5.4 kernel itself.  I wonder 
whether one could change the search order for includes in general to make those 
headers defined in the same tree take precedence over the global ones.

-Stefan
>   tools/testing/selftests/seccomp/seccomp_bpf.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c
> index e9a00d26666f..ab0da56ef7f1 100644
> --- a/tools/testing/selftests/seccomp/seccomp_bpf.c
> +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c
> @@ -26,7 +26,6 @@
>   #include <sys/ptrace.h>
>   #include <sys/user.h>
>   #include <linux/prctl.h>
> -#include <linux/ptrace.h>
>   #include <linux/seccomp.h>
>   #include <pthread.h>
>   #include <semaphore.h>
> @@ -158,12 +157,12 @@ struct seccomp_data {
>   
>   #ifndef PTRACE_SECCOMP_GET_METADATA
>   #define PTRACE_SECCOMP_GET_METADATA	0x420d
> +#endif
>   
>   struct seccomp_metadata {
>   	__u64 filter_off;       /* Input: which filter */
>   	__u64 flags;             /* Output: filter's flags */
>   };
> -#endif
>   
>   #ifndef SECCOMP_FILTER_FLAG_NEW_LISTENER
>   #define SECCOMP_FILTER_FLAG_NEW_LISTENER	(1UL << 3)
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20211027/398d5035/attachment-0001.sig>