Skip to content

Commit

Permalink
Version 6.2.8.6
Browse files Browse the repository at this point in the history
- Added a check for 0 length table line arguments.
  • Loading branch information
corwin committed Dec 13, 2022
1 parent 264ddbd commit d6ba008
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
6 changes: 3 additions & 3 deletions kvdo.spec
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -96,5 +96,5 @@ rm -rf $RPM_BUILD_ROOT
%{_usr}/src/%{kmod_name}-%{version}

%changelog
* Tue Nov 08 2022 - Red Hat VDO Team <[email protected]> - 6.2.8.4-1
- Adapted to backported kernel changes.
* Tue Dec 13 2022 - Red Hat VDO Team <[email protected]> - 6.2.8.6-1
- Added a check for 0 length table line arguments.
2 changes: 1 addition & 1 deletion vdo/Makefile
Original file line number Diff line number Diff line change
@@ -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)))
Expand Down
7 changes: 6 additions & 1 deletion vdo/kernel/deviceConfig.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit d6ba008

Please sign in to comment.