Commit ac84ff45 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Jason Gunthorpe
Browse files

iommufd/driver: Fix counter initialization for counted_by annotation 

One of the requirements for counted_by annotations is that the counter
member must be initialized before the first reference to the
flexible-array member.

Move the vevent->data_len = data_len; initialization to before the
first access to flexible array vevent->event_data.

Link: https://patch.msgid.link/r/aRL7ZFFqM5bRTd2D@kspp


Cc: stable@vger.kernel.org
Fixes: e8e1ef9b ("iommufd/viommu: Add iommufd_viommu_report_event helper")
Signed-off-by: default avatar"Gustavo A. R. Silva" <gustavoars@kernel.org>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarNicolin Chen <nicolinc@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 6a23ae0a

drivers/iommu/iommufd/driver.c

+1 −1
Original line number Diff line number Diff line
@@ -161,8 +161,8 @@ int iommufd_viommu_report_event(struct iommufd_viommu *viommu, 
		vevent = &veventq->lost_events_header;

		goto out_set_header;

	}

	memcpy(vevent->event_data, event_data, data_len);

	vevent->data_len = data_len;

	memcpy(vevent->event_data, event_data, data_len);

	veventq->num_events++;



out_set_header: