Merge "soc: qcom: qmi_encdec: Restrict string length in decode" (58278421) · Commits · e / devices / android_kernel_fairphone_FP3

lib/qmi_encdec.c

+3 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2016, 2019 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
		@@ -706,8 +706,8 @@ static int qmi_decode_string_elem(struct elem_info ei_array, void buf_dst,
		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) {