You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by GitBox <gi...@apache.org> on 2018/11/29 08:43:36 UTC
[GitHub] mkiiskila closed pull request #1537: newtmgr;
crashes with invalid nh_len.
mkiiskila closed pull request #1537: newtmgr; crashes with invalid nh_len.
URL: https://github.com/apache/mynewt-core/pull/1537
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/mgmt/newtmgr/src/newtmgr.c b/mgmt/newtmgr/src/newtmgr.c
index aa6afee551..eea264402e 100644
--- a/mgmt/newtmgr/src/newtmgr.c
+++ b/mgmt/newtmgr/src/newtmgr.c
@@ -188,8 +188,6 @@ nmgr_handle_req(struct nmgr_transport *nt, struct os_mbuf *req)
CborEncoder payload_enc;
struct nmgr_hdr *rsp_hdr;
struct nmgr_hdr hdr;
- int off;
- uint16_t len;
uint16_t mtu;
int rc;
@@ -215,91 +213,83 @@ nmgr_handle_req(struct nmgr_transport *nt, struct os_mbuf *req)
/* Copy the request user header into the response. */
memcpy(OS_MBUF_USRHDR(rsp), OS_MBUF_USRHDR(req), OS_MBUF_USRHDR_LEN(req));
- off = 0;
- len = OS_MBUF_PKTHDR(req)->omp_len;
-
- while (off < len) {
- rc = os_mbuf_copydata(req, off, sizeof(hdr), &hdr);
- if (rc < 0) {
- rc = MGMT_ERR_EINVAL;
- goto err_norsp;
- }
+ rc = os_mbuf_copydata(req, 0, sizeof(hdr), &hdr);
+ if (rc < 0) {
+ rc = MGMT_ERR_EINVAL;
+ goto err_norsp;
+ }
- hdr.nh_len = ntohs(hdr.nh_len);
+ hdr.nh_len = ntohs(hdr.nh_len);
- handler = mgmt_find_handler(ntohs(hdr.nh_group), hdr.nh_id);
- if (!handler) {
- rc = MGMT_ERR_ENOENT;
- goto err;
- }
+ handler = mgmt_find_handler(ntohs(hdr.nh_group), hdr.nh_id);
+ if (!handler) {
+ rc = MGMT_ERR_ENOENT;
+ goto err;
+ }
- /* Build response header apriori. Then pass to the handlers
- * to fill out the response data, and adjust length & flags.
- */
- rsp_hdr = nmgr_init_rsp(rsp, &hdr);
- if (!rsp_hdr) {
- rc = MGMT_ERR_ENOMEM;
- goto err_norsp;
- }
+ /* Build response header apriori. Then pass to the handlers
+ * to fill out the response data, and adjust length & flags.
+ */
+ rsp_hdr = nmgr_init_rsp(rsp, &hdr);
+ if (!rsp_hdr) {
+ rc = MGMT_ERR_ENOMEM;
+ goto err_norsp;
+ }
- cbor_mbuf_reader_init(&nmgr_task_cbuf.reader, req, sizeof(hdr));
- cbor_parser_init(&nmgr_task_cbuf.reader.r, 0,
- &nmgr_task_cbuf.n_b.parser, &nmgr_task_cbuf.n_b.it);
+ cbor_mbuf_reader_init(&nmgr_task_cbuf.reader, req, sizeof(hdr));
+ cbor_parser_init(&nmgr_task_cbuf.reader.r, 0,
+ &nmgr_task_cbuf.n_b.parser, &nmgr_task_cbuf.n_b.it);
- /* Begin response payload. Response fields are inserted into the root
- * map as key value pairs.
- */
- rc = cbor_encoder_create_map(&nmgr_task_cbuf.n_b.encoder, &payload_enc,
- CborIndefiniteLength);
- if (rc != 0) {
- rc = MGMT_ERR_ENOMEM;
- goto err;
- }
+ /* Begin response payload. Response fields are inserted into the root
+ * map as key value pairs.
+ */
+ rc = cbor_encoder_create_map(&nmgr_task_cbuf.n_b.encoder, &payload_enc,
+ CborIndefiniteLength);
+ if (rc != 0) {
+ rc = MGMT_ERR_ENOMEM;
+ goto err;
+ }
- if (hdr.nh_op == NMGR_OP_READ) {
- if (handler->mh_read) {
- rc = handler->mh_read(&nmgr_task_cbuf.n_b);
- } else {
- rc = MGMT_ERR_ENOENT;
- }
- } else if (hdr.nh_op == NMGR_OP_WRITE) {
- if (handler->mh_write) {
- rc = handler->mh_write(&nmgr_task_cbuf.n_b);
- } else {
- rc = MGMT_ERR_ENOENT;
- }
+ if (hdr.nh_op == NMGR_OP_READ) {
+ if (handler->mh_read) {
+ rc = handler->mh_read(&nmgr_task_cbuf.n_b);
} else {
- rc = MGMT_ERR_EINVAL;
+ rc = MGMT_ERR_ENOENT;
}
- if (rc != 0) {
- goto err;
+ } else if (hdr.nh_op == NMGR_OP_WRITE) {
+ if (handler->mh_write) {
+ rc = handler->mh_write(&nmgr_task_cbuf.n_b);
+ } else {
+ rc = MGMT_ERR_ENOENT;
}
+ } else {
+ rc = MGMT_ERR_EINVAL;
+ }
+ if (rc != 0) {
+ goto err;
+ }
- /* End response payload. */
- rc = cbor_encoder_close_container(&nmgr_task_cbuf.n_b.encoder,
- &payload_enc);
- if (rc != 0) {
- rc = MGMT_ERR_ENOMEM;
- goto err;
- }
+ /* End response payload. */
+ rc = cbor_encoder_close_container(&nmgr_task_cbuf.n_b.encoder,
+ &payload_enc);
+ if (rc != 0) {
+ rc = MGMT_ERR_ENOMEM;
+ goto err;
+ }
- rsp_hdr->nh_len +=
- cbor_encode_bytes_written(&nmgr_task_cbuf.n_b.encoder);
- rsp_hdr->nh_len = htons(rsp_hdr->nh_len);
-
- rc = nmgr_rsp_tx(nt, &rsp, mtu);
- if (rc) {
- /* If the entire mbuf was consumed by the transport, don't attempt
- * to send an error response.
- */
- if (rsp == NULL) {
- goto err_norsp;
- } else {
- goto err;
- }
- }
+ rsp_hdr->nh_len += cbor_encode_bytes_written(&nmgr_task_cbuf.n_b.encoder);
+ rsp_hdr->nh_len = htons(rsp_hdr->nh_len);
- off += sizeof(hdr) + OS_ALIGN(hdr.nh_len, 4);
+ rc = nmgr_rsp_tx(nt, &rsp, mtu);
+ if (rc) {
+ /* If the entire mbuf was consumed by the transport, don't attempt
+ * to send an error response.
+ */
+ if (rsp == NULL) {
+ goto err_norsp;
+ } else {
+ goto err;
+ }
}
os_mbuf_free_chain(rsp);
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services