aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-08-25 13:47:08 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-08-25 13:47:25 +0200
commitd3e387eb9c38650a0698bbaf39a0621027f92c45 (patch)
treea48b5031a294be26d784eac7adba9d684a5f177d
parent2d43d376d38ebf91d0ef6b8711bdc134aa1abdd6 (diff)
Size accounting + alloc() overflow checking, round #3
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
-rw-r--r--lib/fstree/xattr.c25
1 files changed, 17 insertions, 8 deletions
diff --git a/lib/fstree/xattr.c b/lib/fstree/xattr.c
index 449ef45..c37c734 100644
--- a/lib/fstree/xattr.c
+++ b/lib/fstree/xattr.c
@@ -7,10 +7,12 @@
#include "config.h"
#include "fstree.h"
+#include "util.h"
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
+#include <errno.h>
static void remove_from_list(fstree_t *fs, tree_xattr_t *xattr)
{
@@ -34,24 +36,31 @@ static tree_xattr_t *grow_xattr_block(tree_xattr_t *xattr)
void *new;
if (xattr != NULL) {
- new_count = xattr->max_attr * 2;
+ if (SZ_MUL_OV(xattr->max_attr, 2, &new_count))
+ goto fail_ov;
old_size = sizeof(*xattr) + sizeof(uint64_t) * xattr->max_attr;
}
- new_size = sizeof(*xattr) + sizeof(uint64_t) * new_count;
- new = realloc(xattr, new_size);
-
- if (new == NULL) {
- perror("adding extended attributes");
- free(xattr);
- return NULL;
+ if (SZ_MUL_OV(sizeof(uint64_t), new_count, &new_size) ||
+ SZ_ADD_OV(sizeof(*xattr), new_size, &new_size)) {
+ goto fail_ov;
}
+ new = realloc(xattr, new_size);
+ if (new == NULL)
+ goto fail;
+
memset((char *)new + old_size, 0, new_size - old_size);
xattr = new;
xattr->max_attr = new_count;
return xattr;
+fail_ov:
+ errno = EOVERFLOW;
+fail:
+ perror("adding extended attributes");
+ free(xattr);
+ return NULL;
}
int fstree_add_xattr(fstree_t *fs, tree_node_t *node,