shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-08 20:58:20 +03:00
Code

acpi-fpdt: don't accidentally drop signedness of pread() return

Browse Source
This commit is contained in:
Lennart Poettering 2022-11-09 15:09:08 +01:00
parent ab10dfe0d5
commit 8cee3283f0
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/shared/acpi-fpdt.c
View File

@ -64,7 +64,8 @@ struct acpi_fpdt_boot {
int acpi_get_boot_usec(usec_t *ret_loader_start, usec_t *ret_loader_exit) {
_cleanup_free_ char *buf = NULL;
struct acpi_table_header *tbl;
size_t l = 0;
size_t l;
ssize_t ll;
struct acpi_fpdt_header *rec;
int r;
uint64_t ptr = 0;
@ -109,8 +110,10 @@ int acpi_get_boot_usec(usec_t *ret_loader_start, usec_t *ret_loader_exit) {
if (fd < 0)
return -errno;
l = pread(fd, &hbrec, sizeof(struct acpi_fpdt_boot_header), ptr);
if (l != sizeof(struct acpi_fpdt_boot_header))
ll = pread(fd, &hbrec, sizeof(struct acpi_fpdt_boot_header), ptr);
if (ll < 0)
return -errno;
if ((size_t) ll != sizeof(struct acpi_fpdt_boot_header))
return -EINVAL;
if (memcmp(hbrec.signature, "FBPT", 4) != 0)
@ -119,8 +122,10 @@ int acpi_get_boot_usec(usec_t *ret_loader_start, usec_t *ret_loader_exit) {
if (hbrec.length < sizeof(struct acpi_fpdt_boot_header) + sizeof(struct acpi_fpdt_boot))
return -EINVAL;
l = pread(fd, &brec, sizeof(struct acpi_fpdt_boot), ptr + sizeof(struct acpi_fpdt_boot_header));
if (l != sizeof(struct acpi_fpdt_boot))
ll = pread(fd, &brec, sizeof(struct acpi_fpdt_boot), ptr + sizeof(struct acpi_fpdt_boot_header));
if (ll < 0)
return -errno;
if ((size_t) ll != sizeof(struct acpi_fpdt_boot))
return -EINVAL;
if (brec.length != sizeof(struct acpi_fpdt_boot))