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

drivers/soc/qcom/qmi_encdec.c

+3 −3

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/*
		* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-2015, 2019 The Linux Foundation. All rights reserved.
		* Copyright (C) 2017 Linaro Ltd.
		*/
		#include <linux/slab.h>
		@@ -534,8 +534,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) {