chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: overflow hardening
[elogind.git]
/
src
/
shared
/
util.c
diff --git
a/src/shared/util.c
b/src/shared/util.c
index b48bad4c468a38068df2d504a7133d57e7ca4b8b..02ee6374c33aa2f50bf9c777c557d823f6bec3b1 100644
(file)
--- a/
src/shared/util.c
+++ b/
src/shared/util.c
@@
-1184,8
+1184,11
@@
char *strnappend(const char *s, const char *suffix, size_t b) {
assert(suffix);
a = strlen(s);
assert(suffix);
a = strlen(s);
+ if ((size_t) -1 - a > b)
+ return NULL;
- if (!(r = new(char, a+b+1)))
+ r = new(char, a+b+1);
+ if (!r)
return NULL;
memcpy(r, s, a);
return NULL;
memcpy(r, s, a);
@@
-5014,12
+5017,17
@@
char *strjoin(const char *x, ...) {
for (;;) {
const char *t;
for (;;) {
const char *t;
+ size_t n;
t = va_arg(ap, const char *);
if (!t)
break;
t = va_arg(ap, const char *);
if (!t)
break;
- l += strlen(t);
+ n = strlen(t);
+ if (n > ((size_t) -1) - l)
+ return NULL;
+
+ l += n;
}
} else
l = 0;
}
} else
l = 0;
@@
-5291,7
+5299,7
@@
int signal_from_string(const char *s) {
int offset = 0;
unsigned u;
int offset = 0;
unsigned u;
- signo =__signal_from_string(s);
+ signo =
__signal_from_string(s);
if (signo > 0)
return signo;
if (signo > 0)
return signo;
@@
-5683,7
+5691,7
@@
void warn_melody(void) {
if (fd < 0)
return;
if (fd < 0)
return;
- /* Yeah, this is synchronous. Kinda sucks. But
e
well... */
+ /* Yeah, this is synchronous. Kinda sucks. But well... */
ioctl(fd, KIOCSOUND, (int)(1193180/440));
usleep(125*USEC_PER_MSEC);
ioctl(fd, KIOCSOUND, (int)(1193180/440));
usleep(125*USEC_PER_MSEC);