Skip to contentSkip to conversation

s390/vfio-ap: Fix memory allocation for mdev_types array

PATCH In review Jason J. Herne 3 participants 3 messages Oct 21, 2022 – Oct 24, 2022

Subsystems (3)
lore
Share & tools
lore

Jason J. Herne

author maintainer
#0 lore raw

PATCH 1/1 s390/vfio-ap: Fix memory allocation for mdev_types array

The vfio-ap crypto driver fails to allocate memory for an array of pointers used to pass supported mdev types to mdev_register_parent().

Since we only support a single mdev type, the fix is to allocate a single entry in the ap_matrix_dev->mdev_types array.

Fixes 63e685747784 ("s390: vfio-ap: base implementation of VFIO AP device driver")
Cc Tony Krowiak <[email protected]>
---
 drivers/s390/crypto/vfio_ap_private.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/crypto/vfio_ap_private.h +1 -1
index 2eddd5f34ed3..976a65f32e7d 100644
@@ -52,7 +52,7 @@ struct ap_matrix_dev {
 	struct mutex guests_lock; /* serializes access to each KVM guest */
 	struct mdev_parent parent;
 	struct mdev_type mdev_type;
-	struct mdev_type *mdev_types[];
+	struct mdev_type *mdev_types[1];
 };
 
 extern struct ap_matrix_dev *matrix_dev;
Signature · 1 line
2.37.3
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Jason J. Herne

The vfio-ap crypto driver fails to allocate memory for an array of pointers used to pass supported mdev types to mdev_register_parent().

Since we only support a single mdev type, the fix is to allocate a single entry in the ap_matrix_dev->mdev_types array.

Fixes 63e685747784 ("s390: vfio-ap: base implementation of VFIO AP device driver")

I think you want

Fixes da44c340c4fe ("vfio/mdev: simplify mdev_type handling")

Where *mdev_types[] was introduced. The fix you propose is the same way Christoph (added to CC) handled vfio-ccw, LGTM.

Quoted 21 lines
---
 drivers/s390/crypto/vfio_ap_private.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/crypto/vfio_ap_private.h +1 -1
index 2eddd5f34ed3..976a65f32e7d 100644
@@ -52,7 +52,7 @@ struct ap_matrix_dev {
 	struct mutex guests_lock; /* serializes access to each KVM guest */
 	struct mdev_parent parent;
 	struct mdev_type mdev_type;
-	struct mdev_type *mdev_types[];
+	struct mdev_type *mdev_types[1];
 };
 
 extern struct ap_matrix_dev *matrix_dev;
#2 lore raw
In reply to Jason J. Herne

Am 21.10.22 um 16:59 schrieb Jason J. Herne:

Quoted 20 lines

The vfio-ap crypto driver fails to allocate memory for an array of pointers used to pass supported mdev types to mdev_register_parent().

Since we only support a single mdev type, the fix is to allocate a single entry in the ap_matrix_dev->mdev_types array.

Fixes 63e685747784 ("s390: vfio-ap: base implementation of VFIO AP device driver")
Cc Tony Krowiak <[email protected]>
---
  drivers/s390/crypto/vfio_ap_private.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/crypto/vfio_ap_private.h +0 -0
index 2eddd5f34ed3..976a65f32e7d 100644

drivers/s390/crypto/vfio_ap_private.h struct ap_matrix_dev { · line 58

Quoted 8 lines
drivers/s390/crypto/vfio_ap_private.h +1 -1
@@ -52,7 +52,7 @@ struct ap_matrix_dev {
  	struct mutex guests_lock; /* serializes access to each KVM guest */
  	struct mdev_parent parent;
  	struct mdev_type mdev_type;
-	struct mdev_type *mdev_types[];
+	struct mdev_type *mdev_types[1];
  };
 
  extern struct ap_matrix_dev *matrix_dev;

Thanks, will go via s390-fixes.

Alex, FYI.