[PATCH] net: qrtr: Fix message type of outgoing packets

[PATCH] net: qrtr: Fix message type of outgoing packets

[Bjorn Andersson]

QRTR packets has a message type in the header, which is repeated in the
control header. For control packets we therefor copy the type from
beginning of the outgoing payload and use that as message type.

For non-control messages an endianness fix introduced in v5.2-rc1 caused the
type to be 0, rather than QRTR_TYPE_DATA, causing all messages to be dropped by
the receiver. Fix this by converting and using qrtr_type, which will remain
QRTR_TYPE_DATA for non-control messages.

Fixes: 8f5e24514cbd ("net: qrtr: use protocol endiannes variable")
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
 net/qrtr/qrtr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c
index 801872a2e7aa..05fa058bee59 100644
--- a/net/qrtr/qrtr.c
+++ b/net/qrtr/qrtr.c
@@ -733,8 +733,8 @@ static int qrtr_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
 	struct sock *sk = sock->sk;
 	struct qrtr_node *node;
 	struct sk_buff *skb;
-	u32 type = 0;
 	size_t plen;
+	u32 type;
 	int rc;
 
 	if (msg->msg_flags & ~(MSG_DONTWAIT))
@@ -809,9 +809,9 @@ static int qrtr_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
 
 		/* control messages already require the type as 'command' */
 		skb_copy_bits(skb, 0, &qrtr_type, 4);
-		type = le32_to_cpu(qrtr_type);
 	}
 
+	type = le32_to_cpu(qrtr_type);
 	rc = enqueue_fn(node, skb, type, &ipc->us, addr);
 	if (rc >= 0)
 		rc = len;
-- 
2.18.0

Re: [PATCH] net: qrtr: Fix message type of outgoing packets

[David Miller]

From: Bjorn Andersson <bjorn.andersson@linaro.org>
Date: Mon, 20 May 2019 16:51:56 -0700

> QRTR packets has a message type in the header, which is repeated in the
> control header. For control packets we therefor copy the type from
> beginning of the outgoing payload and use that as message type.
> 
> For non-control messages an endianness fix introduced in v5.2-rc1 caused the
> type to be 0, rather than QRTR_TYPE_DATA, causing all messages to be dropped by
> the receiver. Fix this by converting and using qrtr_type, which will remain
> QRTR_TYPE_DATA for non-control messages.
> 
> Fixes: 8f5e24514cbd ("net: qrtr: use protocol endiannes variable")
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

Applied, thank you.