From d6ba008a8f22ef09df6ceef15d80fae9a4ae187f Mon Sep 17 00:00:00 2001 From: corwin Date: Tue, 13 Dec 2022 17:50:31 -0500 Subject: [PATCH] Version 6.2.8.6 - Added a check for 0 length table line arguments. --- kvdo.spec | 6 +++--- vdo/Makefile | 2 +- vdo/kernel/deviceConfig.c | 7 ++++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/kvdo.spec b/kvdo.spec index 38e1dda7..83decab8 100644 --- a/kvdo.spec +++ b/kvdo.spec @@ -1,6 +1,6 @@ %define spec_release 1 %define kmod_name kvdo -%define kmod_driver_version 6.2.8.4 +%define kmod_driver_version 6.2.8.6 %define kmod_rpm_release %{spec_release} %define kmod_kernel_version 3.10.0-693.el7 @@ -96,5 +96,5 @@ rm -rf $RPM_BUILD_ROOT %{_usr}/src/%{kmod_name}-%{version} %changelog -* Tue Nov 08 2022 - Red Hat VDO Team - 6.2.8.4-1 -- Adapted to backported kernel changes. +* Tue Dec 13 2022 - Red Hat VDO Team - 6.2.8.6-1 +- Added a check for 0 length table line arguments. diff --git a/vdo/Makefile b/vdo/Makefile index 7cf07e1a..ff7dc8f5 100644 --- a/vdo/Makefile +++ b/vdo/Makefile @@ -1,4 +1,4 @@ -VDO_VERSION = 6.2.8.4 +VDO_VERSION = 6.2.8.6 VDO_VERSION_MAJOR = $(word 1,$(subst ., ,$(VDO_VERSION))) VDO_VERSION_MINOR = $(word 2,$(subst ., ,$(VDO_VERSION))) diff --git a/vdo/kernel/deviceConfig.c b/vdo/kernel/deviceConfig.c index 7e3fa5da..52df2358 100644 --- a/vdo/kernel/deviceConfig.c +++ b/vdo/kernel/deviceConfig.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA. * - * $Id: //eng/vdo-releases/aluminum/src/c++/vdo/kernel/deviceConfig.c#14 $ + * $Id: //eng/vdo-releases/aluminum/src/c++/vdo/kernel/deviceConfig.c#15 $ */ #include "deviceConfig.h" @@ -547,6 +547,11 @@ int parseDeviceConfig(int argc, config->owningTarget = ti; initializeRing(&config->configNode); + if (argc == 0) { + handleParseError(&config, errorPtr, "Incorrect number of arguments"); + return VDO_BAD_CONFIGURATION; + } + // Save the original string. result = joinStrings(argv, argc, ' ', &config->originalString); if (result != VDO_SUCCESS) {