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

Commit 74dd02bc authored by Swetha Chikkaboraiah's avatar Swetha Chikkaboraiah Committed by Gerrit - the friendly Code Review server
Browse files

soc: qcom: socinfo: Protect current_image using semaphore lock. 



Variable current_image can be modified by multiple threads.
This change will protect current_image getting modified
by multiple threads.

Change-Id: I33df463311b24f73b1ba124d388731a72bd13263
CRs-Fixed: 2016485
Signed-off-by: default avatarSwetha Chikkaboraiah <schikk@codeaurora.org>
Signed-off-by: default avatarSrinivasarao P <spathi@codeaurora.org>
parent 06ae7e7e

drivers/soc/qcom/socinfo.c

+35 −5
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2009-2015,2017, 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
@@ -44,6 +44,7 @@ 
#define SMEM_IMAGE_VERSION_OEM_OFFSET 96

#define SMEM_IMAGE_VERSION_PARTITION_APPS 10



static DECLARE_RWSEM(current_image_rwsem);

enum {

	HW_PLATFORM_UNKNOWN = 0,

	HW_PLATFORM_SURF    = 1,
@@ -792,7 +793,9 @@ msm_get_image_version(struct device *dev, 
				__func__);

		return snprintf(buf, SMEM_IMAGE_VERSION_NAME_SIZE, "Unknown");

	}

	down_read(&current_image_rwsem);

	string_address += current_image * SMEM_IMAGE_VERSION_SINGLE_BLOCK_SIZE;

	up_read(&current_image_rwsem);

	return snprintf(buf, SMEM_IMAGE_VERSION_NAME_SIZE, "%-.75s\n",

			string_address);

}
@@ -805,15 +808,20 @@ msm_set_image_version(struct device *dev, 
{

	char *store_address;



	if (current_image != SMEM_IMAGE_VERSION_PARTITION_APPS)

	down_read(&current_image_rwsem);

	if (current_image != SMEM_IMAGE_VERSION_PARTITION_APPS) {

		up_read(&current_image_rwsem);

		return count;

	}

	store_address = socinfo_get_image_version_base_address();

	if (IS_ERR_OR_NULL(store_address)) {

		pr_err("%s : Failed to get image version base address",

				__func__);

		up_read(&current_image_rwsem);

		return count;

	}

	store_address += current_image * SMEM_IMAGE_VERSION_SINGLE_BLOCK_SIZE;

	up_read(&current_image_rwsem);

	snprintf(store_address, SMEM_IMAGE_VERSION_NAME_SIZE, "%-.75s", buf);

	return count;

}
@@ -832,7 +840,9 @@ msm_get_image_variant(struct device *dev, 
		return snprintf(buf, SMEM_IMAGE_VERSION_VARIANT_SIZE,

		"Unknown");

	}

	down_read(&current_image_rwsem);

	string_address += current_image * SMEM_IMAGE_VERSION_SINGLE_BLOCK_SIZE;

	up_read(&current_image_rwsem);

	string_address += SMEM_IMAGE_VERSION_VARIANT_OFFSET;

	return snprintf(buf, SMEM_IMAGE_VERSION_VARIANT_SIZE, "%-.20s\n",

			string_address);
@@ -846,15 +856,20 @@ msm_set_image_variant(struct device *dev, 
{

	char *store_address;



	if (current_image != SMEM_IMAGE_VERSION_PARTITION_APPS)

	down_read(&current_image_rwsem);

	if (current_image != SMEM_IMAGE_VERSION_PARTITION_APPS) {

		up_read(&current_image_rwsem);

		return count;

	}

	store_address = socinfo_get_image_version_base_address();

	if (IS_ERR_OR_NULL(store_address)) {

		pr_err("%s : Failed to get image version base address",

				__func__);

		up_read(&current_image_rwsem);

		return count;

	}

	store_address += current_image * SMEM_IMAGE_VERSION_SINGLE_BLOCK_SIZE;

	up_read(&current_image_rwsem);

	store_address += SMEM_IMAGE_VERSION_VARIANT_OFFSET;

	snprintf(store_address, SMEM_IMAGE_VERSION_VARIANT_SIZE, "%-.20s", buf);

	return count;
@@ -873,7 +888,9 @@ msm_get_image_crm_version(struct device *dev, 
				__func__);

		return snprintf(buf, SMEM_IMAGE_VERSION_OEM_SIZE, "Unknown");

	}

	down_read(&current_image_rwsem);

	string_address += current_image * SMEM_IMAGE_VERSION_SINGLE_BLOCK_SIZE;

	up_read(&current_image_rwsem);

	string_address += SMEM_IMAGE_VERSION_OEM_OFFSET;

	return snprintf(buf, SMEM_IMAGE_VERSION_OEM_SIZE, "%-.32s\n",

			string_address);
@@ -887,15 +904,20 @@ msm_set_image_crm_version(struct device *dev, 
{

	char *store_address;



	if (current_image != SMEM_IMAGE_VERSION_PARTITION_APPS)

	down_read(&current_image_rwsem);

	if (current_image != SMEM_IMAGE_VERSION_PARTITION_APPS) {

		up_read(&current_image_rwsem);

		return count;

	}

	store_address = socinfo_get_image_version_base_address();

	if (IS_ERR_OR_NULL(store_address)) {

		pr_err("%s : Failed to get image version base address",

				__func__);

		up_read(&current_image_rwsem);

		return count;

	}

	store_address += current_image * SMEM_IMAGE_VERSION_SINGLE_BLOCK_SIZE;

	up_read(&current_image_rwsem);

	store_address += SMEM_IMAGE_VERSION_OEM_OFFSET;

	snprintf(store_address, SMEM_IMAGE_VERSION_OEM_SIZE, "%-.32s", buf);

	return count;
@@ -906,8 +928,14 @@ msm_get_image_number(struct device *dev, 
			struct device_attribute *attr,

			char *buf)

{

	return snprintf(buf, PAGE_SIZE, "%d\n",

	int ret;



	down_read(&current_image_rwsem);

	ret = snprintf(buf, PAGE_SIZE, "%d\n",

			current_image);

	up_read(&current_image_rwsem);

	return ret;



}



static ssize_t
@@ -919,10 +947,12 @@ msm_select_image(struct device *dev, struct device_attribute *attr, 
	ret = kstrtoint(buf, 10, &digit);

	if (ret)

		return ret;

	down_write(&current_image_rwsem);

	if (0 <= digit && digit < SMEM_IMAGE_VERSION_BLOCKS_COUNT)

		current_image = digit;

	else

		current_image = 0;

	up_write(&current_image_rwsem);

	return count;

}