blob: 939885b9617f2e86ac294dc50eb64b31cc241584 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
From 863b129441c12eb75d63e4f4fe9a8f7df81607fd Mon Sep 17 00:00:00 2001
From: Paul Barker <paul@paulbarker.me.uk>
Date: Sun, 1 May 2016 14:50:59 +0100
Subject: [PATCH] Fix segfault in login
Fix a bug in readfileat where *plen would be corrupted if you didn't supply
your own buffer (because ibuf is 0 in that case, not a pointer to the start
of the allocated space). This caused a segfault in the 'login' program.
Partial backport of upstream commit 81f31e463bd982a8344ea8681938eb43c9114652
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Upstream-status: Backport
---
lib/lib.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/lib.c b/lib/lib.c
index 6559030..e5bb605 100644
--- a/lib/lib.c
+++ b/lib/lib.c
@@ -475,7 +475,7 @@ char *readfileat(int dirfd, char *name, char *ibuf, off_t *plen)
rbuf = buf+rlen;
len -= rlen;
}
- *plen = len = rlen+(buf-ibuf);
+ *plen = len = rlen+(rbuf-buf);
close(fd);
if (rlen<0) {
--
2.1.4
|
