diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-03-28 05:39:47 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-03-28 05:39:47 +0000 |
| commit | 163539fff8f1cbe04249a96aa39c32cfe2ff5a63 (patch) | |
| tree | 9b19b24d1d88e20f060a3f75218fd94a526eb673 /sys-apps/attr/files | |
| parent | old (diff) | |
| download | historical-163539fff8f1cbe04249a96aa39c32cfe2ff5a63.tar.gz historical-163539fff8f1cbe04249a96aa39c32cfe2ff5a63.tar.bz2 historical-163539fff8f1cbe04249a96aa39c32cfe2ff5a63.zip | |
Grab fix from upstream #127547 by TGL.
Package-Manager: portage-2.1_pre7-r2
Diffstat (limited to 'sys-apps/attr/files')
| -rw-r--r-- | sys-apps/attr/files/attr-2.4.28-list-compat-segv.patch | 74 | ||||
| -rw-r--r-- | sys-apps/attr/files/digest-attr-2.4.28-r1 | 1 |
2 files changed, 75 insertions, 0 deletions
diff --git a/sys-apps/attr/files/attr-2.4.28-list-compat-segv.patch b/sys-apps/attr/files/attr-2.4.28-list-compat-segv.patch new file mode 100644 index 000000000000..b73d7797899b --- /dev/null +++ b/sys-apps/attr/files/attr-2.4.28-list-compat-segv.patch @@ -0,0 +1,74 @@ +Fix a possible segfault from the attr list compat interfaces, +thanks to Simon Munton. + +http://bugs.gentoo.org/127547 + +--- attr/libattr/libattr.c 2006/01/12 23:53:25 1.12 ++++ attr/libattr/libattr.c 2006/02/22 02:54:28 1.13 +@@ -268,7 +268,7 @@ attr_list(const char *path, char *buffer + attrlist_cursor_t *cursor) + { + const char *l; +- int length, count = 0; ++ int length, vlength, count = 0; + char lbuf[MAXLISTLEN]; + char name[MAXNAMELEN+16]; + unsigned int start_offset, end_offset; +@@ -293,14 +293,14 @@ attr_list(const char *path, char *buffer + if (api_unconvert(name, l, flags)) + continue; + if (flags & ATTR_DONTFOLLOW) +- length = lgetxattr(path, l, NULL, 0); ++ vlength = lgetxattr(path, l, NULL, 0); + else +- length = getxattr(path, l, NULL, 0); +- if (length < 0 && (errno == ENOATTR || errno == ENOTSUP)) ++ vlength = getxattr(path, l, NULL, 0); ++ if (vlength < 0 && (errno == ENOATTR || errno == ENOTSUP)) + continue; + if (count++ < cursor->opaque[0]) + continue; +- if (attr_list_pack(name, length, buffer, buffersize, ++ if (attr_list_pack(name, vlength, buffer, buffersize, + &start_offset, &end_offset)) { + cursor->opaque[0] = count; + break; +@@ -314,7 +314,7 @@ attr_listf(int fd, char *buffer, const i + attrlist_cursor_t *cursor) + { + const char *l; +- int c, count = 0; ++ int length, vlength, count = 0; + char lbuf[MAXLISTLEN]; + char name[MAXNAMELEN+16]; + unsigned int start_offset, end_offset; +@@ -325,22 +325,22 @@ attr_listf(int fd, char *buffer, const i + } + bzero(buffer, sizeof(attrlist_t)); + +- c = flistxattr(fd, lbuf, sizeof(lbuf)); +- if (c < 0) +- return c; ++ length = flistxattr(fd, lbuf, sizeof(lbuf)); ++ if (length < 0) ++ return length; + + start_offset = sizeof(attrlist_t); + end_offset = buffersize & ~(8-1); /* 8 byte align */ + +- for (l = lbuf; l != lbuf + c; l = strchr(l, '\0') + 1) { ++ for (l = lbuf; l != lbuf + length; l = strchr(l, '\0') + 1) { + if (api_unconvert(name, l, flags)) + continue; +- c = fgetxattr(fd, l, NULL, 0); +- if (c < 0 && (errno == ENOATTR || errno == ENOTSUP)) ++ vlength = fgetxattr(fd, l, NULL, 0); ++ if (vlength < 0 && (errno == ENOATTR || errno == ENOTSUP)) + continue; + if (count++ < cursor->opaque[0]) + continue; +- if (attr_list_pack(name, c, buffer, buffersize, ++ if (attr_list_pack(name, vlength, buffer, buffersize, + &start_offset, &end_offset)) { + cursor->opaque[0] = count; + break; diff --git a/sys-apps/attr/files/digest-attr-2.4.28-r1 b/sys-apps/attr/files/digest-attr-2.4.28-r1 new file mode 100644 index 000000000000..1ae412814bd0 --- /dev/null +++ b/sys-apps/attr/files/digest-attr-2.4.28-r1 @@ -0,0 +1 @@ +MD5 4fe11d4221199e51f6eeeee37d5dd84c attr-2.4.28.src.tar.gz 106506 |