diff --git a/patches.suse/af_unix-Rename-UNIX-DGRAM-to-UNIX-to-maintain-backwa.patch b/patches.suse/af_unix-Rename-UNIX-DGRAM-to-UNIX-to-maintain-backwa.patch new file mode 100644 index 0000000..0207ad5 --- /dev/null +++ b/patches.suse/af_unix-Rename-UNIX-DGRAM-to-UNIX-to-maintain-backwa.patch @@ -0,0 +1,50 @@ +From: Stephen Boyd +Date: Fri, 8 Oct 2021 14:59:45 -0700 +Subject: af_unix: Rename UNIX-DGRAM to UNIX to maintain backwards + compatability + +Git-commit: 0edf0824e0dc359ed76bf96af986e6570ca2c0b9 +Patch-mainline: v5.15-rc6 +References: bsc#1206476 + +Then name of this protocol changed in commit 94531cfcbe79 ("af_unix: Add +unix_stream_proto for sockmap") because that commit added stream support +to the af_unix protocol. Renaming the existing protocol makes a ChromeOS +protocol test[1] fail now that the name has changed in +/proc/net/protocols from "UNIX" to "UNIX-DGRAM". + +Let's put the name back to how it was while keeping the stream protocol +as "UNIX-STREAM" so that the procfs interface doesn't change. This fixes +the test and maintains backwards compatibility in proc. + +Cc: Jiang Wang +Cc: Andrii Nakryiko +Cc: Cong Wang +Cc: Jakub Sitnicki +Cc: John Fastabend +Cc: Dmitry Osipenko +Link: https://source.chromium.org/chromiumos/chromiumos/codesearch/+/main:src/platform/tast-tests/src/chromiumos/tast/local/bundles/cros/network/supported_protocols.go;l=50;drc=e8b1c3f94cb40a054f4aa1ef1aff61e75dc38f18 [1] +Fixes: 94531cfcbe79 ("af_unix: Add unix_stream_proto for sockmap") +Signed-off-by: Stephen Boyd +Signed-off-by: David S. Miller +Signed-off-by: Yousaf Kaukab +--- + net/unix/af_unix.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c +index 0878ab86597b..89f9e85ae970 100644 +--- a/net/unix/af_unix.c ++++ b/net/unix/af_unix.c +@@ -828,7 +828,7 @@ static void unix_unhash(struct sock *sk) + } + + struct proto unix_dgram_proto = { +- .name = "UNIX-DGRAM", ++ .name = "UNIX", + .owner = THIS_MODULE, + .obj_size = sizeof(struct unix_sock), + .close = unix_close, +-- +2.35.3 + diff --git a/series.conf b/series.conf index 7da43f4..6229d87 100644 --- a/series.conf +++ b/series.conf @@ -5817,6 +5817,7 @@ patches.suse/qed-Fix-missing-error-code-in-qed_slowpath_start.patch patches.suse/net-phy-Do-not-shutdown-PHYs-in-READY-state.patch patches.suse/virtio-net-fix-for-skb_over_panic-inside-big-mode.patch + patches.suse/af_unix-Rename-UNIX-DGRAM-to-UNIX-to-maintain-backwa.patch patches.suse/net-dsa-mv88e6xxx-don-t-use-PHY_DETECT-on-internal-P.patch patches.suse/r8152-select-CRC32-and-CRYPTO-CRYPTO_HASH-CRYPTO_SHA.patch patches.suse/net-dsa-microchip-Added-the-condition-for-scheduling.patch