| Message ID | 20240517093138.1436323-3-mhal@rbox.co (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e060e433e51246d970c5a8aa1c5ccd9ecc7ba4bf |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | af_unix: Fix GC and improve selftest | expand |
On 5/17/24 11:27, Michal Luczaj wrote: > From: Kuniyuki Iwashima <kuniyu@amazon.com> > > scm_rights.c covers various test cases for inflight file descriptors > and garbage collector for AF_UNIX sockets. > > Currently, SCM_RIGHTS messages are sent with 3-bytes string, and it's > not good for MSG_OOB cases, as SCM_RIGTS cmsg goes with the first 2-bytes, > which is non-OOB data. > > Let's send SCM_RIGHTS messages with 1-byte character to pack SCM_RIGHTS > into OOB data. > > Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com> > --- > tools/testing/selftests/net/af_unix/scm_rights.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/net/af_unix/scm_rights.c b/tools/testing/selftests/net/af_unix/scm_rights.c > index bab606c9f1eb..2bfed46e0b19 100644 > --- a/tools/testing/selftests/net/af_unix/scm_rights.c > +++ b/tools/testing/selftests/net/af_unix/scm_rights.c > @@ -197,8 +197,8 @@ void __send_fd(struct __test_metadata *_metadata, > const FIXTURE_VARIANT(scm_rights) *variant, > int inflight, int receiver) > { > -#define MSG "nop" > -#define MSGLEN 3 > +#define MSG "x" > +#define MSGLEN 1 > struct { > struct cmsghdr cmsghdr; > int fd[2]; As discussed in https://lore.kernel.org/netdev/20240517122419.0c9a0539@kernel.org/ : Signed-off-by: Michal Luczaj <mhal@rbox.co>
diff --git a/tools/testing/selftests/net/af_unix/scm_rights.c b/tools/testing/selftests/net/af_unix/scm_rights.c index bab606c9f1eb..2bfed46e0b19 100644 --- a/tools/testing/selftests/net/af_unix/scm_rights.c +++ b/tools/testing/selftests/net/af_unix/scm_rights.c @@ -197,8 +197,8 @@ void __send_fd(struct __test_metadata *_metadata, const FIXTURE_VARIANT(scm_rights) *variant, int inflight, int receiver) { -#define MSG "nop" -#define MSGLEN 3 +#define MSG "x" +#define MSGLEN 1 struct { struct cmsghdr cmsghdr; int fd[2];