From: Marc Kleine-Budde <mkl@pengutronix.de>
To: linux-can@vger.kernel.org
Cc: Marc Kleine-Budde <mkl@pengutronix.de>,
Torin Cooper-Bennun <torin@maxiluxsystems.com>
Subject: [PATCH] can: raw: fix TX CAN frames show up as RX'ed ones
Date: Mon, 10 May 2021 20:20:39 +0200 [thread overview]
Message-ID: <20210510182038.1528631-1-mkl@pengutronix.de> (raw)
Fixes: e940e0895a82 ("can: skb: can_skb_set_owner(): fix ref counting if socket was closed before setting skb ownership")
Reported-by: Torin Cooper-Bennun <torin@maxiluxsystems.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
Hey Torin,
this is only compile time tested. Please give it a try.
regards,
Marc
drivers/net/can/dev/skb.c | 2 ++
include/linux/can/skb.h | 14 +++++++++++---
net/can/raw.c | 2 +-
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/net/can/dev/skb.c b/drivers/net/can/dev/skb.c
index 61660248c69e..9644c0d85bb6 100644
--- a/drivers/net/can/dev/skb.c
+++ b/drivers/net/can/dev/skb.c
@@ -200,6 +200,7 @@ struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf)
can_skb_reserve(skb);
can_skb_prv(skb)->ifindex = dev->ifindex;
can_skb_prv(skb)->skbcnt = 0;
+ can_skb_prv(skb)->flags = 0;
*cf = skb_put_zero(skb, sizeof(struct can_frame));
@@ -231,6 +232,7 @@ struct sk_buff *alloc_canfd_skb(struct net_device *dev,
can_skb_reserve(skb);
can_skb_prv(skb)->ifindex = dev->ifindex;
can_skb_prv(skb)->skbcnt = 0;
+ can_skb_prv(skb)->flags = 0;
*cfd = skb_put_zero(skb, sizeof(struct canfd_frame));
diff --git a/include/linux/can/skb.h b/include/linux/can/skb.h
index d311bc369a39..24a3e682b4a2 100644
--- a/include/linux/can/skb.h
+++ b/include/linux/can/skb.h
@@ -51,6 +51,7 @@ struct can_skb_priv {
int ifindex;
int skbcnt;
unsigned int frame_len;
+ unsigned int flags;
struct can_frame cf[];
};
@@ -71,9 +72,16 @@ static inline void can_skb_set_owner(struct sk_buff *skb, struct sock *sk)
* after the last TX skb has been freed). So only increase
* socket refcount if the refcount is > 0.
*/
- if (sk && refcount_inc_not_zero(&sk->sk_refcnt)) {
- skb->destructor = sock_efree;
- skb->sk = sk;
+ if (sk) {
+ struct can_skb_priv *skb_priv;
+
+ skb_priv = can_skb_prv(skb);
+ skb_priv->flags = MSG_DONTROUTE;
+
+ if (refcount_inc_not_zero(&sk->sk_refcnt)) {
+ skb->destructor = sock_efree;
+ skb->sk = sk;
+ }
}
}
diff --git a/net/can/raw.c b/net/can/raw.c
index 139d9471ddcf..9bedd0672fae 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -169,7 +169,7 @@ static void raw_rcv(struct sk_buff *oskb, void *data)
/* add CAN specific message flags for raw_recvmsg() */
pflags = raw_flags(skb);
*pflags = 0;
- if (oskb->sk)
+ if (can_skb_prv(oskb)->flags == MSG_DONTROUTE)
*pflags |= MSG_DONTROUTE;
if (oskb->sk == sk)
*pflags |= MSG_CONFIRM;
--
2.30.2
next reply other threads:[~2021-05-10 18:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-10 18:20 Marc Kleine-Budde [this message]
2021-05-11 10:00 ` [PATCH] can: raw: fix TX CAN frames show up as RX'ed ones Torin Cooper-Bennun
2021-05-11 10:02 ` Marc Kleine-Budde
2021-05-11 10:39 ` Marc Kleine-Budde
2021-05-27 7:17 ` Joakim Zhang
2021-05-27 8:54 ` Marc Kleine-Budde
2021-07-21 7:59 ` Torin Cooper-Bennun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210510182038.1528631-1-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=linux-can@vger.kernel.org \
--cc=torin@maxiluxsystems.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).