On 28.03.2022 13:36:11, Oliver Hartkopp wrote: > 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 > 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. 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