morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

cryptsetup: fail with error if extraneous arguments are specified

Browse Source 
So far the program would silently ignore those… I think it's better to fail.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2023-09-23 11:59:55 +02:00
parent 166015faf5
commit 5bae80bd44
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/cryptsetup/cryptsetup.c
View File

@@ -2157,6 +2157,8 @@ static int run(int argc, char *argv[]) {
if (argc - optind < 3)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "attach requires at least two arguments.");
if (argc - optind >= 6)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "attach does not accept more than four arguments.");
const char *volume = ASSERT_PTR(argv[optind + 1]),
*source = ASSERT_PTR(argv[optind + 2]),
@@ -2356,6 +2358,9 @@ static int run(int argc, char *argv[]) {
} else if (streq(verb, "detach")) {
const char *volume = ASSERT_PTR(argv[optind + 1]);
if (argc - optind >= 3)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "attach does not accept more than one argument.");
if (!filename_is_valid(volume))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Volume name '%s' is not valid.", volume);