On Tue, Apr 11, 2023 at 04:34:25PM +0200, Oliver Hartkopp wrote: > 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? No, the failure is: > On 4/11/23 13:36, gregkh@xxxxxxxxxxxxxxxxxxx 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 <stable@xxxxxxxxxxxxxxx>. > > > > 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 '<stable@xxxxxxxxxxxxxxx>' --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 <socketcan@xxxxxxxxxxxx> > > 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 <socketcan@xxxxxxxxxxxx> > > Link: https://lore.kernel.org/all/20230330170248.62342-1-socketcan@xxxxxxxxxxxx > > Cc: stable@xxxxxxxxxxxxxxx > > Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx> > > > > diff --git a/net/can/isotp.c b/net/can/isotp.c > > index 9bc344851704..47c2ebad10ed 100644 > > --- a/net/can/isotp.c > > +++ b/net/can/isotp.c > > @@ -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
