system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 02:35:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nm-manager: restore passing correct size to sendfile in copy_lease()

Browse source 
Otherwise sendfile() fails with EINVAL when the file offset
is greater than zero (pos + size > max), always on the second
iteration.

Fixes: 0c6cd07ec8 ('nm-manager: remove lease file if copying dhclient lease fails')

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/359
(cherry picked from commit 70ebdc7730)
This commit is contained in:
Alexey Kodanev 2019-12-11 18:55:07 +03:00 committed by Thomas Haller
parent 61d431a9e8
commit c95bdb21a7
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/nm-manager.c
View file

@ -2700,7 +2700,7 @@ copy_lease (const char *src, const char *dst)
{
nm_auto_close int src_fd = -1;
int dst_fd;
ssize_t res;
ssize_t res, size = SSIZE_MAX;
src_fd = open (src, O_RDONLY|O_CLOEXEC);
if (src_fd < 0)
@ -2710,8 +2710,8 @@ copy_lease (const char *src, const char *dst)
if (dst_fd < 0)
return FALSE;
while ((res = sendfile (dst_fd, src_fd, NULL, G_MAXSSIZE)) > 0) {
}
while ((res = sendfile (dst_fd, src_fd, NULL, size)) > 0)
size -= res;
nm_close (dst_fd);