picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

modules-load: return first error in the loop

Browse source 
Follow-up for a889e206a7.
Fixes CID#1396280.
This commit is contained in:
Yu Watanabe 2018-10-20 02:34:12 +09:00
parent fd5ad16cfb
commit db8794c3a0
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/modules-load/modules-load.c
View file

@ -81,10 +81,10 @@ static int apply_file(struct kmod_ctx *ctx, const char *path, bool ignore_enoent
char *l;
int k;
r = read_line(f, LONG_LINE_MAX, &line);
if (r < 0)
return log_error_errno(errno, "Failed to read file '%s': %m", path);
if (r == 0)
k = read_line(f, LONG_LINE_MAX, &line);
if (k < 0)
return log_error_errno(k, "Failed to read file '%s': %m", path);
if (k == 0)
break;
l = strstrip(line);
@ -94,7 +94,7 @@ static int apply_file(struct kmod_ctx *ctx, const char *path, bool ignore_enoent
continue;
k = module_load_and_warn(ctx, l, true);
if (k < 0 && r == 0)
if (k < 0 && r >= 0)
r = k;
}