netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kuniyuki Iwashima <kuniyu@amazon.com>
To: <kuniyu@amazon.com>
Cc: <brauner@kernel.org>, <davem@davemloft.net>,
	<edumazet@google.com>, <horms@kernel.org>, <kuba@kernel.org>,
	<kuni1840@gmail.com>, <netdev@vger.kernel.org>,
	<pabeni@redhat.com>, <willemb@google.com>
Subject: Re: [PATCH v3 net-next 6/9] af_unix: Move SOCK_PASS{CRED,PIDFD,SEC} to struct sock.
Date: Wed, 14 May 2025 20:18:47 -0700	[thread overview]
Message-ID: <20250515031921.28817-1-kuniyu@amazon.com> (raw)
In-Reply-To: <20250514165226.40410-7-kuniyu@amazon.com>

From: Kuniyuki Iwashima <kuniyu@amazon.com>
Date: Wed, 14 May 2025 09:51:49 -0700
> @@ -523,7 +528,14 @@ struct sock {
>  #endif
>  	int			sk_disconnects;
>  
> -	u8			sk_txrehash;
> +	union {
> +		u8		sk_txrehash;
> +		u8		sk_scm_recv_flags;
> +		u8		sk_scm_credentials : 1,
> +				sk_scm_security : 1,
> +				sk_scm_pidfd : 1,
> +				sk_scm_unused : 5;
> +	};

The bits had to be grouped by struct, otherwise the compiler
treats all sk_scm_XXX bits as the same bit :S

Will fix in v4.

---8<---
diff --git a/include/net/sock.h b/include/net/sock.h
index 0268c28538a1..f17a82d93e5f 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -531,10 +531,12 @@ struct sock {
 	union {
 		u8		sk_txrehash;
 		u8		sk_scm_recv_flags;
-		u8		sk_scm_credentials : 1,
+		struct {
+			u8	sk_scm_credentials : 1,
 				sk_scm_security : 1,
 				sk_scm_pidfd : 1,
 				sk_scm_unused : 5;
+		};
 	};
 	u8			sk_clockid;
 	u8			sk_txtime_deadline_mode : 1,
---8<---

  reply	other threads:[~2025-05-15  3:19 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-14 16:51 [PATCH v3 net-next 0/9] af_unix: Introduce SO_PASSRIGHTS Kuniyuki Iwashima
2025-05-14 16:51 ` [PATCH v3 net-next 1/9] af_unix: Factorise test_bit() for SOCK_PASSCRED and SOCK_PASSPIDFD Kuniyuki Iwashima
2025-05-15 18:07   ` Willem de Bruijn
2025-05-15 20:23     ` Kuniyuki Iwashima
2025-05-15 21:48       ` Willem de Bruijn
2025-05-14 16:51 ` [PATCH v3 net-next 2/9] af_unix: Don't pass struct socket to maybe_add_creds() Kuniyuki Iwashima
2025-05-15 18:07   ` Willem de Bruijn
2025-05-14 16:51 ` [PATCH v3 net-next 3/9] scm: Move scm_recv() from scm.h to scm.c Kuniyuki Iwashima
2025-05-15 18:08   ` Willem de Bruijn
2025-05-14 16:51 ` [PATCH v3 net-next 4/9] tcp: Restrict SO_TXREHASH to TCP socket Kuniyuki Iwashima
2025-05-15 18:36   ` Willem de Bruijn
2025-05-14 16:51 ` [PATCH v3 net-next 5/9] net: Restrict SO_PASS{CRED,PIDFD,SEC} to AF_{UNIX,NETLINK,BLUETOOTH} Kuniyuki Iwashima
2025-05-15 18:36   ` Willem de Bruijn
2025-05-14 16:51 ` [PATCH v3 net-next 6/9] af_unix: Move SOCK_PASS{CRED,PIDFD,SEC} to struct sock Kuniyuki Iwashima
2025-05-15  3:18   ` Kuniyuki Iwashima [this message]
2025-05-15 18:44   ` Willem de Bruijn
2025-05-15 20:35     ` Kuniyuki Iwashima
2025-05-15 22:07       ` Willem de Bruijn
2025-05-15 22:15         ` Kuniyuki Iwashima
2025-05-14 16:51 ` [PATCH v3 net-next 7/9] af_unix: Inherit sk_flags at connect() Kuniyuki Iwashima
2025-05-15 19:06   ` Willem de Bruijn
2025-05-14 16:51 ` [PATCH v3 net-next 8/9] af_unix: Introduce SO_PASSRIGHTS Kuniyuki Iwashima
2025-05-15 19:25   ` Willem de Bruijn
2025-05-15 20:38     ` Kuniyuki Iwashima
2025-05-14 16:51 ` [PATCH v3 net-next 9/9] selftest: af_unix: Test SO_PASSRIGHTS Kuniyuki Iwashima
2025-05-15 19:27   ` Willem de Bruijn
2025-05-15 20:50     ` Kuniyuki Iwashima

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250515031921.28817-1-kuniyu@amazon.com \
    --to=kuniyu@amazon.com \
    --cc=brauner@kernel.org \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=horms@kernel.org \
    --cc=kuba@kernel.org \
    --cc=kuni1840@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=willemb@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).