diff options
Diffstat (limited to 'meta/recipes-support/attr/attr-2.4.44')
5 files changed, 126 insertions, 0 deletions
diff --git a/meta/recipes-support/attr/attr-2.4.44/double-free.patch b/meta/recipes-support/attr/attr-2.4.44/double-free.patch new file mode 100644 index 0000000000..6fc684f6c2 --- /dev/null +++ b/meta/recipes-support/attr/attr-2.4.44/double-free.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | commit 5b28eb3b0e0430ce6af28edc9100ca23299d1218 | ||
2 | Author: Kamil Dudka <kdudka@redhat.com> | ||
3 | Date: Thu Jun 3 15:29:54 2010 +0200 | ||
4 | |||
5 | attr_parse_attr_conf: eliminate a double free | ||
6 | |||
7 | diff --git a/libattr/attr_copy_action.c b/libattr/attr_copy_action.c | ||
8 | index 030bbf5..2697328 100644 | ||
9 | --- a/libattr/attr_copy_action.c | ||
10 | +++ b/libattr/attr_copy_action.c | ||
11 | @@ -81,6 +81,7 @@ repeat: | ||
12 | fclose(file); | ||
13 | file = NULL; | ||
14 | free(text); | ||
15 | + text = NULL; | ||
16 | size_guess *= 2; | ||
17 | goto repeat; | ||
18 | } | ||
diff --git a/meta/recipes-support/attr/attr-2.4.44/memory-leak-in-copy.patch b/meta/recipes-support/attr/attr-2.4.44/memory-leak-in-copy.patch new file mode 100644 index 0000000000..966632d87e --- /dev/null +++ b/meta/recipes-support/attr/attr-2.4.44/memory-leak-in-copy.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | commit 972b42a67393f762936e74d3ce929914181f5f28 | ||
2 | Author: Brandon Philips <brandon@ifup.org> | ||
3 | Date: Thu Dec 17 17:15:57 2009 -0800 | ||
4 | |||
5 | libattr: fix memory leak in attr_copy_action() | ||
6 | |||
7 | stanse found that attr_copy_action returns before freeing the memory | ||
8 | allocated for text. | ||
9 | |||
10 | Move fopen() above the malloc so this is not a problem. | ||
11 | |||
12 | Fixes this bug: | ||
13 | https://bugzilla.novell.com/show_bug.cgi?id=564735 | ||
14 | |||
15 | Signed-off-by: Brandon Philips <bphilips@suse.de> | ||
16 | |||
17 | diff --git a/libattr/attr_copy_action.c b/libattr/attr_copy_action.c | ||
18 | index 0d7aca5..dc94224 100644 | ||
19 | --- a/libattr/attr_copy_action.c | ||
20 | +++ b/libattr/attr_copy_action.c | ||
21 | @@ -53,7 +53,7 @@ free_attr_actions(void) | ||
22 | static int | ||
23 | attr_parse_attr_conf(struct error_context *ctx) | ||
24 | { | ||
25 | - char *text, *t; | ||
26 | + char *text = NULL, *t; | ||
27 | size_t size_guess = 4096, len; | ||
28 | FILE *file; | ||
29 | char *pattern = NULL; | ||
30 | @@ -64,15 +64,16 @@ attr_parse_attr_conf(struct error_context *ctx) | ||
31 | return 0; | ||
32 | |||
33 | repeat: | ||
34 | - text = malloc(size_guess + 1); | ||
35 | - if (!text) | ||
36 | - goto fail; | ||
37 | - | ||
38 | if ((file = fopen(ATTR_CONF, "r")) == NULL) { | ||
39 | if (errno == ENOENT) | ||
40 | return 0; | ||
41 | goto fail; | ||
42 | } | ||
43 | + | ||
44 | + text = malloc(size_guess + 1); | ||
45 | + if (!text) | ||
46 | + goto fail; | ||
47 | + | ||
48 | len = fread(text, 1, size_guess, file); | ||
49 | if (ferror(file)) | ||
50 | goto fail; | ||
diff --git a/meta/recipes-support/attr/attr-2.4.44/memory-leak2.patch b/meta/recipes-support/attr/attr-2.4.44/memory-leak2.patch new file mode 100644 index 0000000000..03395423da --- /dev/null +++ b/meta/recipes-support/attr/attr-2.4.44/memory-leak2.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | commit 42f50a130d144ffbc01738f15da9d4f1b57505bd | ||
2 | Author: Kamil Dudka <kdudka@redhat.com> | ||
3 | Date: Thu Jun 3 15:23:04 2010 +0200 | ||
4 | |||
5 | attr_parse_attr_conf: eliminate a memory leak | ||
6 | |||
7 | diff --git a/libattr/attr_copy_action.c b/libattr/attr_copy_action.c | ||
8 | index dc94224..030bbf5 100644 | ||
9 | --- a/libattr/attr_copy_action.c | ||
10 | +++ b/libattr/attr_copy_action.c | ||
11 | @@ -129,6 +129,7 @@ repeat: | ||
12 | |||
13 | t += strcspn(t, "\n"); | ||
14 | } | ||
15 | + free(text); | ||
16 | return 0; | ||
17 | |||
18 | parse_error: | ||
diff --git a/meta/recipes-support/attr/attr-2.4.44/pull-in-string.h.patch b/meta/recipes-support/attr/attr-2.4.44/pull-in-string.h.patch new file mode 100644 index 0000000000..ccbc236284 --- /dev/null +++ b/meta/recipes-support/attr/attr-2.4.44/pull-in-string.h.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | commit 235cdd2af498d288f1af1142e7a23fbd16dff907 | ||
2 | Author: Mike Frysinger <vapier@gentoo.org> | ||
3 | Date: Fri Jan 8 21:53:19 2010 -0500 | ||
4 | |||
5 | quote: pull in string.h for strchr prototype | ||
6 | |||
7 | Signed-off-by: Mike Frysinger <vapier@gentoo.org> | ||
8 | Signed-off-by: Brandon Philips <brandon@ifup.org> | ||
9 | |||
10 | diff --git a/libmisc/quote.c b/libmisc/quote.c | ||
11 | index f98c887..bf8f9eb 100644 | ||
12 | --- a/libmisc/quote.c | ||
13 | +++ b/libmisc/quote.c | ||
14 | @@ -20,6 +20,7 @@ | ||
15 | #include <stdio.h> | ||
16 | #include <stdlib.h> | ||
17 | #include <ctype.h> | ||
18 | +#include <string.h> | ||
19 | #include "misc.h" | ||
20 | |||
21 | const char *quote(const char *str, const char *quote_chars) | ||
diff --git a/meta/recipes-support/attr/attr-2.4.44/thinko-in-restore.patch b/meta/recipes-support/attr/attr-2.4.44/thinko-in-restore.patch new file mode 100644 index 0000000000..a84de94ed0 --- /dev/null +++ b/meta/recipes-support/attr/attr-2.4.44/thinko-in-restore.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | commit e8d568c696692eed5c92d5a35498e1c26e13d6b3 | ||
2 | Author: Kamil Dudka <kdudka@redhat.com> | ||
3 | Date: Thu Jun 3 15:30:19 2010 +0200 | ||
4 | |||
5 | setfattr.c: fix thinko in restore() | ||
6 | |||
7 | diff --git a/setfattr/setfattr.c b/setfattr/setfattr.c | ||
8 | index 491c25a..0a14cfa 100644 | ||
9 | --- a/setfattr/setfattr.c | ||
10 | +++ b/setfattr/setfattr.c | ||
11 | @@ -120,7 +120,7 @@ int restore(const char *filename) | ||
12 | break; | ||
13 | line++; | ||
14 | if (strncmp(l, "# file: ", 8) != 0) { | ||
15 | - if (filename) { | ||
16 | + if (file != stdin) { | ||
17 | fprintf(stderr, _("%s: %s: No filename found " | ||
18 | "in line %d, aborting\n"), | ||
19 | progname, filename, backup_line); | ||