Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99125214 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: ipc_router: Fix buffer overflow during memcpy"

parents 0d75fa8a 04988039

net/ipc_router/ipc_router_core.c

+3 −2
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static uint32_t ipc_router_calc_checksum(union rr_control_msg *msg) 
 */

static void skb_copy_to_log_buf(struct sk_buff_head *skb_head,

				unsigned int pl_len, unsigned int hdr_offset,

				uint64_t *log_buf)

				unsigned char *log_buf)

{

	struct sk_buff *temp_skb;

	unsigned int copied_len = 0, copy_len = 0;
@@ -357,7 +357,8 @@ static void ipc_router_log_msg(void *log_ctx, uint32_t xchng_type, 
			else if (hdr->version == IPC_ROUTER_V2)

				hdr_offset = sizeof(struct rr_header_v2);

		}

		skb_copy_to_log_buf(skb_head, buf_len, hdr_offset, &pl_buf);

		skb_copy_to_log_buf(skb_head, buf_len, hdr_offset,

				    (unsigned char *)&pl_buf);



		if (port_ptr && rport_ptr && (port_ptr->type == CLIENT_PORT)

				&& (rport_ptr->server != NULL)) {