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

shared/machine-image: avoid passing NULL to log_debug_errno

Browse source 
Fixes: https://github.com/systemd/systemd/issues/12534
This commit is contained in:
Mike Gilbert 2019-05-22 10:31:01 -04:00 committed by Zbigniew Jędrzejewski-Szmek
parent a43b1f8267
commit bcb846f30f
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/shared/machine-image.c
View file

@ -201,11 +201,13 @@ static int image_make(
Image **ret) { Image **ret) {
_cleanup_free_ char *pretty_buffer = NULL; _cleanup_free_ char *pretty_buffer = NULL;
_cleanup_free_ char *cwd = NULL;
struct stat stbuf; struct stat stbuf;
bool read_only; bool read_only;
int r; int r;
assert(dfd >= 0 || dfd == AT_FDCWD); assert(dfd >= 0 || dfd == AT_FDCWD);
assert(path || dfd == AT_FDCWD);
assert(filename); assert(filename);
/* We explicitly *do* follow symlinks here, since we want to allow symlinking trees, raw files and block /* We explicitly *do* follow symlinks here, since we want to allow symlinking trees, raw files and block
@ -221,6 +223,9 @@ static int image_make(
st = &stbuf; st = &stbuf;
} }
if (!path)
safe_getcwd(&cwd);
read_only = read_only =
(path && path_startswith(path, "/usr")) || (path && path_startswith(path, "/usr")) ||
(faccessat(dfd, filename, W_OK, AT_EACCESS) < 0 && errno == EROFS); (faccessat(dfd, filename, W_OK, AT_EACCESS) < 0 && errno == EROFS);
@ -359,7 +364,7 @@ static int image_make(
block_fd = openat(dfd, filename, O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY); block_fd = openat(dfd, filename, O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY);
if (block_fd < 0) if (block_fd < 0)
log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path, filename); log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
else { else {
/* Refresh stat data after opening the node */ /* Refresh stat data after opening the node */
if (fstat(block_fd, &stbuf) < 0) if (fstat(block_fd, &stbuf) < 0)
@ -373,13 +378,13 @@ static int image_make(
int state = 0; int state = 0;
if (ioctl(block_fd, BLKROGET, &state) < 0) if (ioctl(block_fd, BLKROGET, &state) < 0)
log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path, filename); log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
else if (state) else if (state)
read_only = true; read_only = true;
} }
if (ioctl(block_fd, BLKGETSIZE64, &size) < 0) if (ioctl(block_fd, BLKGETSIZE64, &size) < 0)
log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path, filename); log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
block_fd = safe_close(block_fd); block_fd = safe_close(block_fd);
} }