On 31.03.2022 08:28:54, Oliver Hartkopp wrote:
> > > Fixes: 42bf50a1795a ("can: isotp: support MSG_TRUNC flag when reading from socket")
> > > Link: https://github.com/linux-can/can-utils/issues/347#issuecomment-1079554254
> > > From: Derek Will <derekrobertwill@xxxxxxxxx>
> >
> > If this patch is from Derek Will, we need Derek's Signed-off-by [1] and
> > change to author information accordingly.
> >
> > [1] https://elixir.bootlin.com/linux/v5.12/source/Documentation/process/submitting-patches.rst#L356
> >
> > > Tested-by: Derek Will <derekrobertwill@xxxxxxxxx>
> > > Signed-off-by: Oliver Hartkopp <socketcan@xxxxxxxxxxxx>
> >
> > If Derek replies to this mail with his S-o-b line, I'll fix the author
> > while applying the patch.
>
> Although I would have liked Derek to show up as author of the patch
> (because of he found the issue) he has not been reacting for some time
> now.
>
> Therefore I would suggest to take the authorship (I wrote the commit
> message anyway) and tag Derek with Reported/Suggested?/Tested-by if
> you do not want to wait to push the other pending patches to Jakub.
I've changed it to all 3: Reported/Suggested/Tested-by. :)
| commit e382fea8ae54f5bb62869c6b69b33993d43adeca
| Author: Oliver Hartkopp <socketcan@xxxxxxxxxxxx>
| Date: Mon Mar 28 13:36:11 2022 +0200
|
| can: isotp: restore accidentally removed MSG_PEEK feature
|
| In commit 42bf50a1795a ("can: isotp: support MSG_TRUNC flag when
| reading from socket") a new check for recvmsg flags has been
| introduced that only checked for the flags that are handled in
| isotp_recvmsg() itself.
|
| This accidentally removed the MSG_PEEK feature flag which is processed
| later in the call chain in __skb_try_recv_from_queue().
|
| Add MSG_PEEK to the set of valid flags to restore the feature.
|
| Fixes: 42bf50a1795a ("can: isotp: support MSG_TRUNC flag when reading from socket")
| Link: https://github.com/linux-can/can-utils/issues/347#issuecomment-1079554254
| Link: https://lore.kernel.org/all/20220328113611.3691-1-socketcan@xxxxxxxxxxxx
| Reported-by: Derek Will <derekrobertwill@xxxxxxxxx>
| Suggested-by: Derek Will <derekrobertwill@xxxxxxxxx>
| Tested-by: Derek Will <derekrobertwill@xxxxxxxxx>
| Signed-off-by: Oliver Hartkopp <socketcan@xxxxxxxxxxxx>
| Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
Writing a pull request after this mail.
regards,
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung West/Dortmund | Phone: +49-231-2826-924 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Attachment:
signature.asc
Description: PGP signature
