提交 3e696217 编写于 作者: X Xiaolong Huang 提交者: Yang Yingliang

net: qrtr: fix another OOB Read in qrtr_endpoint_post

stable inclusion
from linux-4.19.206
commit ce7d8be2eaa4cab3032e256d154d1c33843d2367
CVE: CVE-2021-3743

--------------------------------

commit 7e78c597 upstream.

This check was incomplete, did not consider size is 0:

	if (len != ALIGN(size, 4) + hdrlen)
                    goto err;

if size from qrtr_hdr is 0, the result of ALIGN(size, 4)
will be 0, In case of len == hdrlen and size == 0
in header this check won't fail and

	if (cb->type == QRTR_TYPE_NEW_SERVER) {
                /* Remote node endpoint can bridge other distant nodes */
                const struct qrtr_ctrl_pkt *pkt = data + hdrlen;

                qrtr_node_assign(node, le32_to_cpu(pkt->server.node));
        }

will also read out of bound from data, which is hdrlen allocated block.

Fixes: 194ccc88 ("net: qrtr: Support decoding incoming v2 packets")
Fixes: ad9d24c9 ("net: qrtr: fix OOB Read in qrtr_endpoint_post")
Signed-off-by: NXiaolong Huang <butterflyhuangxx@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
Reviewed-by: NXiu Jianfeng <xiujianfeng@huawei.com>
Reviewed-by: NYue Haibing <yuehaibing@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 bf380b78
...@@ -315,7 +315,7 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len) ...@@ -315,7 +315,7 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len)
goto err; goto err;
} }
if (len != ALIGN(size, 4) + hdrlen) if (!size || len != ALIGN(size, 4) + hdrlen)
goto err; goto err;
if (cb->dst_port != QRTR_PORT_CTRL && cb->type != QRTR_TYPE_DATA) if (cb->dst_port != QRTR_PORT_CTRL && cb->type != QRTR_TYPE_DATA)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册