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

Commit b2abeaa1 authored by Viresh Kumar's avatar Viresh Kumar Committed by Greg Kroah-Hartman
Browse files

greybus: firmware: s/_LEN/_SIZE 



Alex Elder pointed out that the macros also count the trailing NULL
('\0') character and so it should be using SIZE instead of LEN.

This patch makes that change.

Reported-by: default avatarAlex Elder <alex.elder@linaro.org>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 769cb837

drivers/staging/greybus/Documentation/firmware/firmware-management

+4 −4
Original line number Diff line number Diff line
@@ -104,20 +104,20 @@ Following are the IOCTLs and their data structures available to the user: 




struct fw_mgmt_ioc_get_intf_version {

	__u8 firmware_tag[GB_FIRMWARE_U_TAG_MAX_LEN];

	__u8 firmware_tag[GB_FIRMWARE_U_TAG_MAX_SIZE];

	__u16 major;

	__u16 minor;

} __attribute__ ((__packed__));



struct fw_mgmt_ioc_get_backend_version {

	__u8 firmware_tag[GB_FIRMWARE_U_TAG_MAX_LEN];

	__u8 firmware_tag[GB_FIRMWARE_U_TAG_MAX_SIZE];

	__u16 major;

	__u16 minor;

	__u8 status;

} __attribute__ ((__packed__));



struct fw_mgmt_ioc_intf_load_and_validate {

	__u8			firmware_tag[GB_FIRMWARE_TAG_MAX_LEN];

	__u8			firmware_tag[GB_FIRMWARE_TAG_MAX_SIZE];

	__u8			load_method;

	__u8			status;

	__u16			major;
@@ -125,7 +125,7 @@ struct fw_mgmt_ioc_intf_load_and_validate { 
} __packed;



struct fw_mgmt_ioc_backend_fw_update {

	__u8			firmware_tag[GB_FIRMWARE_TAG_MAX_LEN];

	__u8			firmware_tag[GB_FIRMWARE_TAG_MAX_SIZE];

	__u8			status;

} __packed;

drivers/staging/greybus/Documentation/firmware/firmware.c

+3 −3
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static int update_intf_firmware(int fd) 
	intf_load.minor = 0;



	strncpy((char *)&intf_load.firmware_tag, firmware_tag,

		GB_FIRMWARE_U_TAG_MAX_LEN);

		GB_FIRMWARE_U_TAG_MAX_SIZE);



	ret = ioctl(fd, FW_MGMT_IOC_INTF_LOAD_AND_VALIDATE, &intf_load);

	if (ret < 0) {
@@ -146,7 +146,7 @@ static int update_backend_firmware(int fd) 
	printf("Getting Backend Firmware Version\n");



	strncpy((char *)&backend_fw_info.firmware_tag, firmware_tag,

		GB_FIRMWARE_U_TAG_MAX_LEN);

		GB_FIRMWARE_U_TAG_MAX_SIZE);



retry_fw_version:

	ret = ioctl(fd, FW_MGMT_IOC_GET_BACKEND_FW, &backend_fw_info);
@@ -174,7 +174,7 @@ static int update_backend_firmware(int fd) 
	printf("Updating Backend Firmware\n");



	strncpy((char *)&backend_update.firmware_tag, firmware_tag,

		GB_FIRMWARE_U_TAG_MAX_LEN);

		GB_FIRMWARE_U_TAG_MAX_SIZE);



retry_fw_update:

	backend_update.status = 0;

drivers/staging/greybus/firmware.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#define FW_NAME_PREFIX	"gmp_"



/* Length of the string in format: "FW_NAME_PREFIX""%08x_%08x_%08x_%08x_%s.tftf" */

#define FW_NAME_LEN		56

#define FW_NAME_SIZE		56



/* Firmware Management Protocol specific functions */

int fw_mgmt_init(void);

drivers/staging/greybus/fw-download.c

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ struct fw_request { 
	u8			firmware_id;

	bool			disabled;

	bool			timedout;

	char			name[FW_NAME_LEN];

	char			name[FW_NAME_SIZE];

	const struct firmware	*fw;

	struct list_head	node;
@@ -239,7 +239,7 @@ static int fw_download_find_firmware(struct gb_operation *op) 
	tag = (const char *)request->firmware_tag;



	/* firmware_tag should be null-terminated */

	if (strnlen(tag, GB_FIRMWARE_TAG_MAX_LEN) == GB_FIRMWARE_TAG_MAX_LEN) {

	if (strnlen(tag, GB_FIRMWARE_TAG_MAX_SIZE) == GB_FIRMWARE_TAG_MAX_SIZE) {

		dev_err(fw_download->parent,

			"firmware-tag is not null-terminated\n");

		return -EINVAL;

drivers/staging/greybus/fw-management.c

+9 −9
Original line number Diff line number Diff line
@@ -122,16 +122,16 @@ static int fw_mgmt_interface_fw_version_operation(struct fw_mgmt *fw_mgmt, 
	fw_info->minor = le16_to_cpu(response.minor);



	strncpy(fw_info->firmware_tag, response.firmware_tag,

		GB_FIRMWARE_TAG_MAX_LEN);

		GB_FIRMWARE_TAG_MAX_SIZE);



	/*

	 * The firmware-tag should be NULL terminated, otherwise throw error but

	 * don't fail.

	 */

	if (fw_info->firmware_tag[GB_FIRMWARE_TAG_MAX_LEN - 1] != '\0') {

	if (fw_info->firmware_tag[GB_FIRMWARE_TAG_MAX_SIZE - 1] != '\0') {

		dev_err(fw_mgmt->parent,

			"fw-version: firmware-tag is not NULL terminated\n");

		fw_info->firmware_tag[GB_FIRMWARE_TAG_MAX_LEN - 1] = '\0';

		fw_info->firmware_tag[GB_FIRMWARE_TAG_MAX_SIZE - 1] = '\0';

	}



	return 0;
@@ -151,13 +151,13 @@ static int fw_mgmt_load_and_validate_operation(struct fw_mgmt *fw_mgmt, 
	}



	request.load_method = load_method;

	strncpy(request.firmware_tag, tag, GB_FIRMWARE_TAG_MAX_LEN);

	strncpy(request.firmware_tag, tag, GB_FIRMWARE_TAG_MAX_SIZE);



	/*

	 * The firmware-tag should be NULL terminated, otherwise throw error and

	 * fail.

	 */

	if (request.firmware_tag[GB_FIRMWARE_TAG_MAX_LEN - 1] != '\0') {

	if (request.firmware_tag[GB_FIRMWARE_TAG_MAX_SIZE - 1] != '\0') {

		dev_err(fw_mgmt->parent, "load-and-validate: firmware-tag is not NULL terminated\n");

		return -EINVAL;

	}
@@ -249,13 +249,13 @@ static int fw_mgmt_backend_fw_version_operation(struct fw_mgmt *fw_mgmt, 
	int ret;



	strncpy(request.firmware_tag, fw_info->firmware_tag,

		GB_FIRMWARE_TAG_MAX_LEN);

		GB_FIRMWARE_TAG_MAX_SIZE);



	/*

	 * The firmware-tag should be NULL terminated, otherwise throw error and

	 * fail.

	 */

	if (request.firmware_tag[GB_FIRMWARE_TAG_MAX_LEN - 1] != '\0') {

	if (request.firmware_tag[GB_FIRMWARE_TAG_MAX_SIZE - 1] != '\0') {

		dev_err(fw_mgmt->parent, "backend-version: firmware-tag is not NULL terminated\n");

		return -EINVAL;

	}
@@ -302,13 +302,13 @@ static int fw_mgmt_backend_fw_update_operation(struct fw_mgmt *fw_mgmt, 
	struct gb_fw_mgmt_backend_fw_update_request request;

	int ret;



	strncpy(request.firmware_tag, tag, GB_FIRMWARE_TAG_MAX_LEN);

	strncpy(request.firmware_tag, tag, GB_FIRMWARE_TAG_MAX_SIZE);



	/*

	 * The firmware-tag should be NULL terminated, otherwise throw error and

	 * fail.

	 */

	if (request.firmware_tag[GB_FIRMWARE_TAG_MAX_LEN - 1] != '\0') {

	if (request.firmware_tag[GB_FIRMWARE_TAG_MAX_SIZE - 1] != '\0') {

		dev_err(fw_mgmt->parent, "backend-update: firmware-tag is not NULL terminated\n");

		return -EINVAL;

	}