Re: [GIT PULL] Networking for v5.15

From: Srinivas Kandagatla
Date: Thu Sep 02 2021 - 05:28:25 EST




On 02/09/2021 10:25, Dan Carpenter wrote:
I'm sorry John,

Can you try this partial revert? I'll resend with a commit message if
it works.
I was about to send similar patch.

This should work, I think your original patch introduced a qrtr packet payload alignment constraint which was not there originally.


Tested-by: Srinivas Kandagatla <srinivas.kandagatla@xxxxxxxxxx>

--srini

---
net/qrtr/qrtr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c
index 525e3ea063b1..ec2322529727 100644
--- a/net/qrtr/qrtr.c
+++ b/net/qrtr/qrtr.c
@@ -493,7 +493,7 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len)
goto err;
}
- if (!size || size & 3 || len != size + hdrlen)
+ if (!size || len != ALIGN(size, 4) + hdrlen)
goto err;
if (cb->dst_port != QRTR_PORT_CTRL && cb->type != QRTR_TYPE_DATA &&