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

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

Merge "soc: qcom: tracer_pkt: Fix buffer length check"

parents 2234e1b7 59fd790e

drivers/soc/qcom/tracer_pkt.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015, 2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -100,7 +100,7 @@ int tracer_pkt_init(void *data, size_t data_len, 
	pkt_hdr->reserved = 0;

	pkt_hdr->id_valid = 0;

	pkt_hdr->qdss_tracing = qdss_tracing ? true : false;

	if (pkt_priv_len > MAX_CC_WLEN * sizeof(uint32_t))

	if (pkt_priv_len >= MAX_CC_WLEN * sizeof(uint32_t))

		pkt_hdr->ccl = MAX_CC_WLEN;

	else

		pkt_hdr->ccl = pkt_priv_len/sizeof(uint32_t) +