From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 75F8010E95E for ; Fri, 10 Nov 2023 09:51:54 +0000 (UTC) Message-ID: Date: Fri, 10 Nov 2023 15:21:27 +0530 Content-Language: en-US To: Vignesh Raman , , , , References: <20231110084106.655504-1-vignesh.raman@collabora.com> From: "Modem, Bhanuprakash" In-Reply-To: <20231110084106.655504-1-vignesh.raman@collabora.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit MIME-Version: 1.0 Subject: Re: [igt-dev] [PATCH i-g-t 1/3 v5] lib/igt_kms: Fix memory corruption List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: Hi Vignesh, On Fri-10-11-2023 02:11 pm, Vignesh Raman wrote: > virtio-gpu kernel driver, which provides KMS, reports 16 for count_crtcs > which exceeds IGT_MAX_PIPES set to 8. The function igt_display_require > allocates memory for IGT_MAX_PIPES members of igt_pipe_t structures, > but then writes into it based on the count_crtcs reported by the kernel, > resulting in memory corruption. > > # malloc(): corrupted top size > # Received signal SIGABRT. > # Stack trace: > # #0 [fatal_sig_handler+0x17b] > # #1 [__sigaction+0x40] > # #2 [pthread_key_delete+0x14c] > # #3 [gsignal+0x12] > # #4 [abort+0xd3] > # #5 [__fsetlocking+0x290] > # #6 [timer_settime+0x37a] > # #7 [__default_morecore+0x1f1b] > # #8 [__libc_calloc+0x161] > # #9 [drmModeGetPlaneResources+0x44] > # #10 [igt_display_require+0x194] > # #11 [__igt_unique____real_main1356+0x93c] > # #12 [main+0x3f] > # #13 [__libc_init_first+0x8a] > # #14 [__libc_start_main+0x85] > # #15 [_start+0x21] > > Increase IGT_MAX_PIPES to 16 to fix this memory corruption issue. > igt_display_require initializes display and allocate resources as > a prerequisite for the tests. Skip the test if count_crtcs exceeds > IGT_MAX_PIPES with debug information. > > This fix is required for drm-ci to run igt tests on virtio-gpu. > > Reviewed-by: Daniel Stone > Acked-by: Helen Koike > Suggested-by: Daniel Stone > Suggested-by: Bhanuprakash Modem > Signed-off-by: Vignesh Raman > --- > > v2: > - Rework the fix to increase IGT_MAX_PIPES to 16. > > v3: > - Fail the test if count_crtcs exceeds IGT_MAX_PIPES with debug information. > > v4: > - Update test documentation and blacklist tests. > > v5: > - Skip the test if count_crtcs exceeds IGT_MAX_PIPES with debug information. > Split the commits. > > --- > lib/igt_kms.c | 6 +++++- > lib/igt_kms.h | 20 +++++++++++++++++++- > 2 files changed, 24 insertions(+), 2 deletions(-) > > diff --git a/lib/igt_kms.c b/lib/igt_kms.c > index 453103f90..bbcc12b47 100644 > --- a/lib/igt_kms.c > +++ b/lib/igt_kms.c > @@ -906,7 +906,7 @@ static igt_plane_t *igt_get_assigned_primary(igt_output_t *output, igt_pipe_t *p > */ > const char *kmstest_pipe_name(enum pipe pipe) > { > - static const char str[] = "A\0B\0C\0D\0E\0F\0G\0H"; > + static const char str[] = "A\0B\0C\0D\0E\0F\0G\0H\0I\0J\0K\0L\0M\0N\0O\0P"; > > _Static_assert(sizeof(str) == IGT_MAX_PIPES * 2, > "Missing pipe name"); > @@ -2770,6 +2770,10 @@ void igt_display_require(igt_display_t *display, int drm_fd) > } > #endif > > + igt_require_f(resources->count_crtcs <= IGT_MAX_PIPES, ---------------------------------------------^ As pipe index starts from 0, we must use '<' not '<='. > + "count_crtcs exceeds IGT_MAX_PIPES, resources->count_crtcs=%d, IGT_MAX_PIPES=%d\n", > + resources->count_crtcs, IGT_MAX_PIPES); > + > display->n_pipes = IGT_MAX_PIPES; > display->pipes = calloc(sizeof(igt_pipe_t), display->n_pipes); > igt_assert_f(display->pipes, "Failed to allocate memory for %d pipes\n", display->n_pipes); > diff --git a/lib/igt_kms.h b/lib/igt_kms.h > index 9028ab9be..5c705b585 100644 > --- a/lib/igt_kms.h > +++ b/lib/igt_kms.h > @@ -57,6 +57,16 @@ > * @PIPE_D: Fourth crtc. > * @PIPE_E: Fifth crtc. > * @PIPE_F: Sixth crtc. > + * @PIPE_G: Seventh crtc. > + * @PIPE_H: Eighth crtc. > + * @PIPE_I: Ninth crtc. > + * @PIPE_J: Tenth crtc. > + * @PIPE_K: Eleventh crtc. > + * @PIPE_L: Twelfth crtc. > + * @PIPE_M: Thirteenth crtc. > + * @PIPE_N: Fourteenth crtc. > + * @PIPE_O: Fifteenth crtc. > + * @PIPE_P: Sixteenth crtc. > * @IGT_MAX_PIPES: Max number of pipes allowed. > */ > enum pipe { > @@ -70,7 +80,15 @@ enum pipe { > PIPE_F, > PIPE_G, > PIPE_H, > - IGT_MAX_PIPES > + PIPE_I, > + PIPE_J, > + PIPE_K, > + PIPE_L, > + PIPE_M, > + PIPE_N, > + PIPE_O, > + PIPE_P, > + IGT_MAX_PIPES Please don't mix tabs & spaces, and try to align with the declaration of previous pipes. Apart from these minor fixes, this patch LGTM. With above comments addressed, this patch is Reviewed-by: Bhanuprakash Modem - Bhanu > }; > const char *kmstest_pipe_name(enum pipe pipe); > int kmstest_pipe_to_index(char pipe);