summaryrefslogtreecommitdiffstats
path: root/package/keyutils/keyutils-01-memleak-from-realloc.patch
diff options
context:
space:
mode:
authorVicente Olivert Riera <Vincent.Riera@imgtec.com>2014-09-24 09:44:19 +0100
committerPeter Korsgaard <peter@korsgaard.com>2014-09-28 22:30:05 +0200
commit339df19f7a851ea7c92bc8d01c577e7d5fe20023 (patch)
treeb37223d63d4bccabd4339f334f0e574a6e835d1e /package/keyutils/keyutils-01-memleak-from-realloc.patch
parent155a48bac214bd600f4aaa4211469d9c8f2b48f5 (diff)
downloadbuildroot-339df19f7a851ea7c92bc8d01c577e7d5fe20023.tar.gz
buildroot-339df19f7a851ea7c92bc8d01c577e7d5fe20023.zip
keyutils: Bump version to 1.5.9, fix patches and
- Bump version to 1.5.9 - Remove patches already included in this version - Use make parameters instead of environment variables - Add an upstream patch to fix building statically - Adapt old patches to the new version - Add a hash file Fixes: http://autobuild.buildroot.net/results/ced/ced596bd1c73286f7044f5a8e11b6588fc973f11/ Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/keyutils/keyutils-01-memleak-from-realloc.patch')
-rw-r--r--package/keyutils/keyutils-01-memleak-from-realloc.patch51
1 files changed, 0 insertions, 51 deletions
diff --git a/package/keyutils/keyutils-01-memleak-from-realloc.patch b/package/keyutils/keyutils-01-memleak-from-realloc.patch
deleted file mode 100644
index 0faa9d8604..0000000000
--- a/package/keyutils/keyutils-01-memleak-from-realloc.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Patch vampirised from Debian's packaging of keyutils-1.4
-
-Author: Michael Gebetsroither <gebi@grml.org>
-Description: Fixed memleak from realloc (Closes: #496466).
-
-diff -Naurp keyutils.orig/keyutils.c keyutils/keyutils.c
---- keyutils.orig/keyutils.c 2008-08-09 21:46:52.000000000 +0200
-+++ keyutils/keyutils.c 2008-08-25 13:38:07.000000000 +0200
-@@ -165,6 +165,24 @@ long keyctl_assume_authority(key_serial_
- return keyctl(KEYCTL_ASSUME_AUTHORITY, id);
- }
-
-+
-+/*****************************************************************************/
-+/*
-+ * plain realloc is just crazy
-+ */
-+static void* __xrealloc(void* ptr, size_t size)
-+{
-+ void* ret;
-+
-+ ret = realloc(ptr, size);
-+ if(!ret) {
-+ free(ptr);
-+ return 0;
-+ }
-+ return ret;
-+}
-+
-+
- /*****************************************************************************/
- /*
- * fetch key description into an allocated buffer
-@@ -194,7 +212,7 @@ int keyctl_describe_alloc(key_serial_t i
- break;
-
- buflen = ret;
-- buf = realloc(buf, buflen);
-+ buf = __xrealloc(buf, buflen);
- if (!buf)
- return -1;
- }
-@@ -233,7 +251,7 @@ int keyctl_read_alloc(key_serial_t id, v
- break;
-
- buflen = ret;
-- buf = realloc(buf, buflen + 1);
-+ buf = __xrealloc(buf, buflen + 1);
- if (!buf)
- return -1;
- }
OpenPOWER on IntegriCloud