Skip to contentSkip to conversation

net: qrtr: make checks in qrtr_endpoint_post() stricter

PATCH Superseded Dan Carpenter 3 participants 5 messages Aug 27, 2021 – Aug 30, 2021

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: qrtr: make checks in qrtr_endpoint_post() stricter

These checks are still not strict enough. The main problem is that if "cb->type == QRTR_TYPE_NEW_SERVER" is true then "len - hdrlen" is guaranteed to be 4 but we need to be at least 16 bytes. In fact, we can reject everything smaller than sizeof(*pkt) which is 20 bytes.

Also I don't like the ALIGN(size, 4). It's better to just insist that data is needs to be aligned at the start.

Fixes 0baa99ee353c ("net: qrtr: Allow non-immediate node routing")

---
This was from review. Not tested.

 net/qrtr/qrtr.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
net/qrtr/qrtr.c +6 -2
index b8508e35d20e..dbb647f5481b 100644
@@ -493,7 +493,7 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len)
 		goto err;
 	}
 
-	if (!size || len != ALIGN(size, 4) + hdrlen)
+	if (!size || size % 3 || len != size + hdrlen)
 		goto err;
 
 	if (cb->dst_port != QRTR_PORT_CTRL && cb->type != QRTR_TYPE_DATA &&
@@ -506,8 +506,12 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len)
 
 	if (cb->type == QRTR_TYPE_NEW_SERVER) {
 		/* Remote node endpoint can bridge other distant nodes */
-		const struct qrtr_ctrl_pkt *pkt = data + hdrlen;
+		const struct qrtr_ctrl_pkt *pkt;
 
+		if (size < sizeof(*pkt))
+			goto err;
+
+		pkt = data + hdrlen;
 		qrtr_node_assign(node, le32_to_cpu(pkt->server.node));
 	}
 
Signature · 1 line
2.20.1
#1 lore raw
Quoted 22 lines · Dan Carpenter

These checks are still not strict enough. The main problem is that if "cb->type == QRTR_TYPE_NEW_SERVER" is true then "len - hdrlen" is guaranteed to be 4 but we need to be at least 16 bytes. In fact, we can reject everything smaller than sizeof(*pkt) which is 20 bytes.

Also I don't like the ALIGN(size, 4). It's better to just insist that data is needs to be aligned at the start.

Fixes 0baa99ee353c ("net: qrtr: Allow non-immediate node routing")

---
This was from review. Not tested.

 net/qrtr/qrtr.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
net/qrtr/qrtr.c +0 -0
index b8508e35d20e..dbb647f5481b 100644

net/qrtr/qrtr.c int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len) · line 497

Quoted 6 lines
net/qrtr/qrtr.c +1 -1
@@ -493,7 +493,7 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len)
                goto err;
        }
 
 
-       if (!size || len != ALIGN(size, 4) + hdrlen)
+       if (!size || size % 3 || len != size + hdrlen)

Hi, (size % 3) is wrong, is it (size & 3), right ?

net/qrtr/qrtr.c int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len) · line 511

Quoted 11 lines
net/qrtr/qrtr.c +0 -0
                goto err;
 
        if (cb->dst_port != QRTR_PORT_CTRL && cb->type != QRTR_TYPE_DATA &&
net/qrtr/qrtr.c +2 -1
@@ -506,8 +506,12 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len)
 
        if (cb->type == QRTR_TYPE_NEW_SERVER) {
                /* Remote node endpoint can bridge other distant nodes */
-               const struct qrtr_ctrl_pkt *pkt = data + hdrlen;
+               const struct qrtr_ctrl_pkt *pkt;
 
+               if (size < sizeof(*pkt))

Yes, the size should not be smaller than sizeof(*pkt).

Quoted 9 lines
net/qrtr/qrtr.c +3 -1
+                       goto err;
+
+               pkt = data + hdrlen;
                qrtr_node_assign(node, le32_to_cpu(pkt->server.node));
        }
 
--

2.20.1

Regards,
butt3rflyh4ck

Signature · 1 line
Active Defense Lab of Venustech
#2 lore raw
Quoted 27 lines · On Fri, Aug 27, 2021 at 11:35:31PM +0800, butt3rflyh4ck wrote:
Quoted 25 lines · Dan Carpenter

These checks are still not strict enough. The main problem is that if "cb->type == QRTR_TYPE_NEW_SERVER" is true then "len - hdrlen" is guaranteed to be 4 but we need to be at least 16 bytes. In fact, we can reject everything smaller than sizeof(*pkt) which is 20 bytes.

Also I don't like the ALIGN(size, 4). It's better to just insist that data is needs to be aligned at the start.

Fixes 0baa99ee353c ("net: qrtr: Allow non-immediate node routing")

---
This was from review. Not tested.

 net/qrtr/qrtr.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
net/qrtr/qrtr.c +0 -0
index b8508e35d20e..dbb647f5481b 100644
@@ -493,7 +493,7 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len)
                goto err;
        }
 
Quoted 5 lines

net/qrtr/qrtr.c int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len) · line 496

Quoted 2 lines
net/qrtr/qrtr.c +1 -1
-       if (!size || len != ALIGN(size, 4) + hdrlen)
+       if (!size || size % 3 || len != size + hdrlen)

Hi, (size % 3) is wrong, is it (size & 3), right ?

Yeah. Thanks for catching that. I means & 3.

regards,
dan carpenter

#3 lore raw

PATCH v2 1/1 net: qrtr: make checks in qrtr_endpoint_post() stricter

In reply to butt3rflyh4ck

These checks are still not strict enough. The main problem is that if "cb->type == QRTR_TYPE_NEW_SERVER" is true then "len - hdrlen" is guaranteed to be 4 but we need to be at least 16 bytes. In fact, we can reject everything smaller than sizeof(*pkt) which is 20 bytes.

Also I don't like the ALIGN(size, 4). It's better to just insist that data is needs to be aligned at the start.

Fixes 0baa99ee353c ("net: qrtr: Allow non-immediate node routing")

---
v2: Fix a % vs & bug. Thanks, butt3rflyh4ck!

 net/qrtr/qrtr.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
net/qrtr/qrtr.c +6 -2
index b8508e35d20e..dbb647f5481b 100644
@@ -493,7 +493,7 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len)
 		goto err;
 	}
 
-	if (!size || len != ALIGN(size, 4) + hdrlen)
+	if (!size || size & 3 || len != size + hdrlen)
 		goto err;
 
 	if (cb->dst_port != QRTR_PORT_CTRL && cb->type != QRTR_TYPE_DATA &&
@@ -506,8 +506,12 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len)
 
 	if (cb->type == QRTR_TYPE_NEW_SERVER) {
 		/* Remote node endpoint can bridge other distant nodes */
-		const struct qrtr_ctrl_pkt *pkt = data + hdrlen;
+		const struct qrtr_ctrl_pkt *pkt;
 
+		if (size < sizeof(*pkt))
+			goto err;
+
+		pkt = data + hdrlen;
 		qrtr_node_assign(node, le32_to_cpu(pkt->server.node));
 	}
 
Signature · 1 line
2.20.1
#4 lore raw
This patch was applied to netdev/net-next.git (refs/heads/master):

Hello:

This patch was applied to netdev/net-next.git (refs/heads/master):

Quoted 9 lines · On Mon, 30 Aug 2021 11:37:17 +0300 you wrote:

These checks are still not strict enough. The main problem is that if "cb->type == QRTR_TYPE_NEW_SERVER" is true then "len - hdrlen" is guaranteed to be 4 but we need to be at least 16 bytes. In fact, we can reject everything smaller than sizeof(*pkt) which is 20 bytes.

Also I don't like the ALIGN(size, 4). It's better to just insist that data is needs to be aligned at the start.

[...]

Here is the summary with links:
- [v2,net] net: qrtr: make checks in qrtr_endpoint_post() stricter

    https://git.kernel.org/netdev/net-next/c/aaa8e4922c88

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html