From 7fb865947cd131d34703f0dc7ce153fb2e6676fc Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 12 Dec 2017 10:59:26 +0100 Subject: [PATCH] cli: avoid out-of-bounds-read for show_device_info() Probably not critical, because it will still include the terminating NULL, and just continue to fill the temporary buffer with static addresses. Found by coverity. Fixes: bfb9fd0d2f3d602a69537fe7776426ee9202ce9e (cherry picked from commit c274b565a66e0c2932377554ce4d33a4772602e4) --- clients/cli/devices.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 467ce427d2..da969fbe7a 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -1116,8 +1116,8 @@ show_device_info (NMDevice *device, NmCli *nmc) (const NMMetaAbstractInfo *const*) nmc_fields_dev_show_general, FALSE, NULL, NULL); - row = g_new0 (NmcOutputField, _NM_META_SETTING_TYPE_NUM + 1); - for (i = 0; i < _NM_META_SETTING_TYPE_NUM; i++) + row = g_new0 (NmcOutputField, G_N_ELEMENTS (nmc_fields_dev_show_general)); + for (i = 0; i < G_N_ELEMENTS (nmc_fields_dev_show_general); i++) row[i].info = (const NMMetaAbstractInfo *) &nmc_fields_dev_show_general[i]; print_required_fields (&nmc->nmc_config, NMC_OF_FLAG_MAIN_HEADER_ONLY,