[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected. No action required from the submitter.
The upstream commit SHA1 provided is correct: 99a7a5b9943ea2d05fb0dee38e4ae2290477ed83
WARNING: Author mismatch between patch and upstream commit: Backport author: Lee Joneslee@kernel.org Commit author: Kuniyuki Iwashimakuniyu@amazon.com
Status in newer kernel trees: 6.14.y | Present (exact SHA1) 6.12.y | Present (exact SHA1) 6.6.y | Not found
Note: The patch differs from the upstream commit: --- 1: 99a7a5b9943ea ! 1: ec2aeb54a3930 af_unix: Remove CONFIG_UNIX_SCM. @@ Metadata ## Commit message ## af_unix: Remove CONFIG_UNIX_SCM.
+ [ Upstream commit 99a7a5b9943ea2d05fb0dee38e4ae2290477ed83 ] + Originally, the code related to garbage collection was all in garbage.c.
Commit f4e65870e5ce ("net: split out functions related to registering @@ Commit message Acked-by: Jens Axboe axboe@kernel.dk Link: https://lore.kernel.org/r/20240129190435.57228-4-kuniyu@amazon.com Signed-off-by: Jakub Kicinski kuba@kernel.org + (cherry picked from commit 99a7a5b9943ea2d05fb0dee38e4ae2290477ed83) + Signed-off-by: Lee Jones lee@kernel.org
## include/net/af_unix.h ## @@ include/net/af_unix.h: static inline struct unix_sock *unix_get_socket(struct file *filp) @@ net/Makefile: obj-$(CONFIG_NETFILTER) += netfilter/ -obj-$(CONFIG_UNIX_SCM) += unix/ +obj-$(CONFIG_UNIX) += unix/ obj-y += ipv6/ + obj-$(CONFIG_BPFILTER) += bpfilter/ obj-$(CONFIG_PACKET) += packet/ - obj-$(CONFIG_NET_KEY) += key/
## net/unix/Kconfig ## @@ net/unix/Kconfig: config UNIX @@ net/unix/Makefile: unix-$(CONFIG_BPF_SYSCALL) += unix_bpf.o
## net/unix/af_unix.c ## @@ + #include <linux/file.h> #include <linux/btf_ids.h> - #include <linux/bpf-cgroup.h>
-#include "scm.h" - @@ net/unix/scm.c (deleted) - /* Socket ? */ - if (S_ISSOCK(inode->i_mode) && !(filp->f_mode & FMODE_PATH)) { - struct socket *sock = SOCKET_I(inode); -- const struct proto_ops *ops = READ_ONCE(sock->ops); - struct sock *s = sock->sk; - - /* PF_UNIX ? */ -- if (s && ops && ops->family == PF_UNIX) +- if (s && sock->ops && sock->ops->family == PF_UNIX) - return unix_sk(s); - } - ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.6.y | Success | Success |