FAILED: patch "[PATCH] can: isotp: isotp_recvmsg(): use sock_recv_cmsgs() to get" failed to apply to 5.10-stable tree

PATCH [email protected] 2 participants 4 messages Apr 11, 2023

Subsystems (2)

Stable branch CAN network layer

lore

Share & tools

lore

[email protected]

author maintainer

2023-04-11 11:36 UTC #0 lore raw

The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 0145462fc802cd447ef5d029758043c7f15b4b1e
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023041107-basically-gas-eb2c@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..

Possible dependencies:

0145462fc802 ("can: isotp: isotp_recvmsg(): use sock_recv_cmsgs() to get SOCK_RXQ_OVFL infos")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 0145462fc802cd447ef5d029758043c7f15b4b1e Mon Sep 17 00:00:00 2001
From: Oliver Hartkopp <[email protected]>
Date: Thu, 30 Mar 2023 19:02:48 +0200
Subject: [PATCH] can: isotp: isotp_recvmsg(): use sock_recv_cmsgs() to get
SOCK_RXQ_OVFL infos

isotp.c was still using sock_recv_timestamp() which does not provide control messages to detect dropped PDUs in the receive path.

Fixes e057dd3fc20f ("can: add ISO 15765-2:2016 transport protocol")

Signed-off-by Oliver Hartkopp <[email protected]>

Link https://lore.kernel.org/all/[email protected] open here

Cc [email protected]

Signed-off-by Marc Kleine-Budde <[email protected]>

net/can/isotp.c +1 -1

index 9bc344851704..47c2ebad10ed 100644
@@ -1120,7 +1120,7 @@ static int isotp_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
 	if (ret < 0)
 		goto out_err;
 
-	sock_recv_timestamp(msg, sk, skb);
+	sock_recv_cmsgs(msg, sk, skb);
 
 	if (msg->msg_name) {
 		__sockaddr_check_size(ISOTP_MIN_NAMELEN);

Oliver Hartkopp

maintainer

2023-04-11 14:40 UTC #1 lore raw

Hi Greg,

this must be a false positive for 5.10 and 5.15.

I can apply the commit 0145462fc802cd447ef5d029758043c7f15b4b1e on 5.10.y and 5.15.y without problems as the code around

    sock_recv_timestamp(msg, sk, skb);

did not change from 5.10 to 6.3-rc

But 'git am' tells the offset is about ~80 lines.
Could this be the reason for the failure?

Best regards,
Oliver

Quoted 54 lines · On 4/11/23 13:36, [email protected] wrote:

The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 0145462fc802cd447ef5d029758043c7f15b4b1e
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023041107-basically-gas-eb2c@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
0145462fc802 ("can: isotp: isotp_recvmsg(): use sock_recv_cmsgs() to get SOCK_RXQ_OVFL infos")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 0145462fc802cd447ef5d029758043c7f15b4b1e Mon Sep 17 00:00:00 2001
From: Oliver Hartkopp <[email protected]>
Date: Thu, 30 Mar 2023 19:02:48 +0200
Subject: [PATCH] can: isotp: isotp_recvmsg(): use sock_recv_cmsgs() to get
SOCK_RXQ_OVFL infos
isotp.c was still using sock_recv_timestamp() which does not provide control messages to detect dropped PDUs in the receive path.
Fixes e057dd3fc20f ("can: add ISO 15765-2:2016 transport protocol")
Signed-off-by Oliver Hartkopp <[email protected]>
Link https://lore.kernel.org/all/[email protected] open here
Cc [email protected]
Signed-off-by Marc Kleine-Budde <[email protected]>
net/can/isotp.c +1 -1
index 9bc344851704..47c2ebad10ed 100644
@@ -1120,7 +1120,7 @@ static int isotp_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
  	if (ret < 0)
  		goto out_err;
 
-	sock_recv_timestamp(msg, sk, skb);
+	sock_recv_cmsgs(msg, sk, skb);
 
  	if (msg->msg_name) {
  		__sockaddr_check_size(ISOTP_MIN_NAMELEN);

Greg KH

author maintainer

2023-04-11 14:40 UTC #2 lore raw

Quoted 7 lines · Oliver Hartkopp

Hi Greg,
this must be a false positive for 5.10 and 5.15.
I can apply the commit 0145462fc802cd447ef5d029758043c7f15b4b1e on 5.10.y and 5.15.y without problems as the code around

Quoted 6 lines

    sock_recv_timestamp(msg, sk, skb);
did not change from 5.10 to 6.3-rc
But 'git am' tells the offset is about ~80 lines.
Could this be the reason for the failure?

No, the failure is:

Quoted 41 lines · On 4/11/23 13:36, [email protected] wrote:

Quoted 40 lines
The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 0145462fc802cd447ef5d029758043c7f15b4b1e
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023041107-basically-gas-eb2c@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
0145462fc802 ("can: isotp: isotp_recvmsg(): use sock_recv_cmsgs() to get SOCK_RXQ_OVFL infos")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 0145462fc802cd447ef5d029758043c7f15b4b1e Mon Sep 17 00:00:00 2001
From: Oliver Hartkopp <[email protected]>
Date: Thu, 30 Mar 2023 19:02:48 +0200
Subject: [PATCH] can: isotp: isotp_recvmsg(): use sock_recv_cmsgs() to get
SOCK_RXQ_OVFL infos
isotp.c was still using sock_recv_timestamp() which does not provide control messages to detect dropped PDUs in the receive path.
Fixes e057dd3fc20f ("can: add ISO 15765-2:2016 transport protocol")
Signed-off-by Oliver Hartkopp <[email protected]>
Link https://lore.kernel.org/all/[email protected] open here
Cc [email protected]
Signed-off-by Marc Kleine-Budde <[email protected]>

Quoted 9 lines

net/can/isotp.c static int isotp_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, · line 1122
Quoted 9 lines
net/can/isotp.c +1 -1
index 9bc344851704..47c2ebad10ed 100644
@@ -1120,7 +1120,7 @@ static int isotp_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
  	if (ret < 0)
  		goto out_err;
-	sock_recv_timestamp(msg, sk, skb);
+	sock_recv_cmsgs(msg, sk, skb);

This function is not in the 5.15.y or 5.10.y tree, so it breaks the build.

thanks,

greg k-h

Oliver Hartkopp

maintainer

2023-04-11 14:47 UTC #3 lore raw

Quoted 58 lines · Greg KH

Quoted 7 lines · Oliver Hartkopp
Hi Greg,
this must be a false positive for 5.10 and 5.15.
I can apply the commit 0145462fc802cd447ef5d029758043c7f15b4b1e on 5.10.y and 5.15.y without problems as the code around
Quoted 6 lines
     sock_recv_timestamp(msg, sk, skb);
did not change from 5.10 to 6.3-rc
But 'git am' tells the offset is about ~80 lines.
Could this be the reason for the failure?
No, the failure is:
Quoted 41 lines · On 4/11/23 13:36, [email protected] wrote:
Quoted 40 lines
The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 0145462fc802cd447ef5d029758043c7f15b4b1e
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023041107-basically-gas-eb2c@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
0145462fc802 ("can: isotp: isotp_recvmsg(): use sock_recv_cmsgs() to get SOCK_RXQ_OVFL infos")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 0145462fc802cd447ef5d029758043c7f15b4b1e Mon Sep 17 00:00:00 2001
From: Oliver Hartkopp <[email protected]>
Date: Thu, 30 Mar 2023 19:02:48 +0200
Subject: [PATCH] can: isotp: isotp_recvmsg(): use sock_recv_cmsgs() to get
SOCK_RXQ_OVFL infos
isotp.c was still using sock_recv_timestamp() which does not provide control messages to detect dropped PDUs in the receive path.
Fixes e057dd3fc20f ("can: add ISO 15765-2:2016 transport protocol")
Signed-off-by Oliver Hartkopp <[email protected]>
Link https://lore.kernel.org/all/[email protected] open here
Cc [email protected]
Signed-off-by Marc Kleine-Budde <[email protected]>

Quoted 12 lines

Quoted 9 lines
net/can/isotp.c static int isotp_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, · line 1122
Quoted 9 lines
net/can/isotp.c +1 -1
index 9bc344851704..47c2ebad10ed 100644
@@ -1120,7 +1120,7 @@ static int isotp_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
   	if (ret < 0)
   		goto out_err;
-	sock_recv_timestamp(msg, sk, skb);
+	sock_recv_cmsgs(msg, sk, skb);
This function is not in the 5.15.y or 5.10.y tree, so it breaks the build.

Ah, that's the point! Thanks!

Then this patch can indeed not be applied and you simply skip them and I do not have any requirement to send a 'backported' patch.

Good.

Many thanks,
Oliver