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

sleep-config: pin swap device while operating via O_PATH

Browse Source
This commit is contained in:
Lennart Poettering
2023-06-20 12:32:21 +02:00
parent 1296b427a7
commit 98034eb0ea
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/shared/sleep-config.c
View File

@@ -611,15 +611,18 @@ HibernateLocation* hibernate_location_free(HibernateLocation *hl) {
}
static int swap_device_to_device_id(const SwapEntry *swap, dev_t *ret_dev) {
_cleanup_close_ int fd = -EBADF;
struct stat sb;
int r;
assert(swap);
assert(swap->device);
assert(swap->type);
r = stat(swap->device, &sb);
if (r < 0)
fd = open(swap->device, O_CLOEXEC|O_PATH);
if (fd < 0)
return -errno;
if (fstat(fd, &sb) < 0)
return -errno;
if (swap->type == SWAP_BLOCK) {
@@ -634,7 +637,7 @@ static int swap_device_to_device_id(const SwapEntry *swap, dev_t *ret_dev) {
if (r < 0)
return r;
return get_block_device(swap->device, ret_dev);
return get_block_device_fd(fd, ret_dev);
}
/*