diff mbox series

Add SCM_SECURITY, SCM_PIDFD to bits/socket.h

Message ID 16452ef-e89d-9618-efbf-475f95eb6e36@codesourcery.com
State New
Headers show
Series Add SCM_SECURITY, SCM_PIDFD to bits/socket.h | expand

Commit Message

Joseph Myers Oct. 13, 2023, 9:45 p.m. UTC
Linux 6.5 adds a constant SCM_PIDFD (recall that the non-uapi
linux/socket.h, where this constant is added, is in fact a header
providing many constants that are part of the kernel/userspace
interface).  This shows up that SCM_SECURITY, from the same set of
definitions and added in Linux 2.6.17, is also missing from glibc,
although glibc has the first two constants from this set, SCM_RIGHTS
and SCM_CREDENTIALS; add both missing constants to glibc.

Tested for x86_64.

Comments

Florian Weimer Oct. 14, 2023, 8:47 a.m. UTC | #1
* Joseph Myers:

> Linux 6.5 adds a constant SCM_PIDFD (recall that the non-uapi
> linux/socket.h, where this constant is added, is in fact a header
> providing many constants that are part of the kernel/userspace
> interface).  This shows up that SCM_SECURITY, from the same set of
> definitions and added in Linux 2.6.17, is also missing from glibc,
> although glibc has the first two constants from this set, SCM_RIGHTS
> and SCM_CREDENTIALS; add both missing constants to glibc.
>
> Tested for x86_64.
>
> diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
> index 57b05715be..c19814c5cf 100644
> --- a/sysdeps/unix/sysv/linux/bits/socket.h
> +++ b/sysdeps/unix/sysv/linux/bits/socket.h
> @@ -367,6 +367,10 @@ enum
>  #ifdef __USE_GNU
>      , SCM_CREDENTIALS = 0x02	/* Credentials passing.  */
>  # define SCM_CREDENTIALS SCM_CREDENTIALS
> +    , SCM_SECURITY = 0x03	/* Security label.  */
> +# define SCM_SECURITY SCM_SECURITY
> +    , SCM_PIDFD = 0x04		/* Pidfd.  */
> +# define SCM_PIDFD SCM_PIDFD
>  #endif
>    };

Looks good, thanks.  It's tested in tools/ in the kernel tree, so it
seems this is part of UAPI despite not being defined/declared in
include/uapi/.
diff mbox series

Patch

diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
index 57b05715be..c19814c5cf 100644
--- a/sysdeps/unix/sysv/linux/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/bits/socket.h
@@ -367,6 +367,10 @@  enum
 #ifdef __USE_GNU
     , SCM_CREDENTIALS = 0x02	/* Credentials passing.  */
 # define SCM_CREDENTIALS SCM_CREDENTIALS
+    , SCM_SECURITY = 0x03	/* Security label.  */
+# define SCM_SECURITY SCM_SECURITY
+    , SCM_PIDFD = 0x04		/* Pidfd.  */
+# define SCM_PIDFD SCM_PIDFD
 #endif
   };