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

Commit 7e4ec7df authored by Hans Verkuil's avatar Hans Verkuil Committed by Ray Zhang
Browse files

[media] cec: an inner loop clobbered the outer loop variable 



An inner for-loop reused the outer loop variable. This was
only noticeable with CEC adapters supporting more than one
logical address.

Change-Id: Ib5cd7c3130b544a991bbc188a762e330ddee2eba
Signed-off-by: default avatarHans Verkuil <hansverk@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
Git-commit: a161bef04286e1344cd469098213a972af8fa7d6
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git


Signed-off-by: default avatarRay Zhang <rayz@codeaurora.org>
parent 5b959979

drivers/media/cec/cec-adap.c

+5 −4
Original line number Diff line number Diff line
@@ -1416,6 +1416,7 @@ int __cec_s_log_addrs(struct cec_adapter *adap, 
		const u8 feature_sz = ARRAY_SIZE(log_addrs->features[0]);

		u8 *features = log_addrs->features[i];

		bool op_is_dev_features = false;

		unsigned j;



		log_addrs->log_addr[i] = CEC_LOG_ADDR_INVALID;

		if (type_mask & (1 << log_addrs->log_addr_type[i])) {
@@ -1442,19 +1443,19 @@ int __cec_s_log_addrs(struct cec_adapter *adap, 
			dprintk(1, "unknown logical address type\n");

			return -EINVAL;

		}

		for (i = 0; i < feature_sz; i++) {

			if ((features[i] & 0x80) == 0) {

		for (j = 0; j < feature_sz; j++) {

			if ((features[j] & 0x80) == 0) {

				if (op_is_dev_features)

					break;

				op_is_dev_features = true;

			}

		}

		if (!op_is_dev_features || i == feature_sz) {

		if (!op_is_dev_features || j == feature_sz) {

			dprintk(1, "malformed features\n");

			return -EINVAL;

		}

		/* Zero unused part of the feature array */

		memset(features + i + 1, 0, feature_sz - i - 1);

		memset(features + j + 1, 0, feature_sz - j - 1);

	}



	if (log_addrs->cec_version >= CEC_OP_CEC_VERSION_2_0) {