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

greybus: manifest: Account for padding in string descriptor 



String descriptors are padded towards the end to align them to 4 byte
boundaries. Take that into account while calculating expected size.

Reviewed-by: default avatarAlex Elder <elder@linaro.org>
Reviewed-by: default avatarJohan Hovold <johan@hovoldconsulting.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent af6e8b42

drivers/staging/greybus/manifest.c

+3 −0
Original line number Diff line number Diff line
@@ -100,6 +100,9 @@ static int identify_descriptor(struct gb_interface *intf, 
	case GREYBUS_TYPE_STRING:

		expected_size += sizeof(struct greybus_descriptor_string);

		expected_size += desc->string.length;



		/* String descriptors are padded to 4 byte boundaries */

		expected_size = ALIGN(expected_size, 4);

		break;

	case GREYBUS_TYPE_INTERFACE:

		expected_size += sizeof(struct greybus_descriptor_interface);