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

Commit 645ef21c authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: qmi_encdec: Restrict string length in decode"

parents 85db5e05 9c1b21f5

drivers/soc/qcom/qmi_encdec.c

+3 −3
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2015, 2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2015, 2017, 2019 The Linux Foundation. All rights reserved.

 * Copyright (C) 2017 Linaro Ltd.

 *

 * This program is free software; you can redistribute it and/or modify
@@ -543,8 +543,8 @@ static int qmi_decode_string_elem(struct qmi_elem_info *ei_array, 
		decoded_bytes += rc;

	}



	if (string_len > temp_ei->elem_len) {

		pr_err("%s: String len %d > Max Len %d\n",

	if (string_len >= temp_ei->elem_len) {

		pr_err("%s: String len %d >= Max Len %d\n",

		       __func__, string_len, temp_ei->elem_len);

		return -ETOOSMALL;

	} else if (string_len > tlv_len) {