From 7b4214534ccdf6f8aa6e566d7501aab328c72e84 Mon Sep 17 00:00:00 2001 From: Robert Mustacchi Date: Mon, 23 Nov 2020 14:09:18 -0800 Subject: 13324 struct dk_minfo_ext size differences trigger SSP in libfdisk Reviewed by: Jason King Reviewed by: Andy Fiddaman Reviewed by: Toomas Soome Approved by: Joshua Clulow --- usr/src/uts/common/io/lofi.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'usr/src/uts/common/io/lofi.c') diff --git a/usr/src/uts/common/io/lofi.c b/usr/src/uts/common/io/lofi.c index f59c7ec848..4ccef8c3f4 100644 --- a/usr/src/uts/common/io/lofi.c +++ b/usr/src/uts/common/io/lofi.c @@ -3340,7 +3340,14 @@ lofi_ioctl(dev_t dev, int cmd, intptr_t arg, int flag, cred_t *credp, if (cmd == DKIOCGMEDIAINFOEXT) { media_info.dki_pbsize = 1U << lsp->ls_pbshift; - size = sizeof (struct dk_minfo_ext); + switch (ddi_model_convert_from(flag & FMODELS)) { + case DDI_MODEL_ILP32: + size = sizeof (struct dk_minfo_ext32); + break; + default: + size = sizeof (struct dk_minfo_ext); + break; + } } else { size = sizeof (struct dk_minfo); } -- cgit v1.2.3