Eamon Walsh wrote:
Daniel J Walsh wrote:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Looks like the selabel stuff is leaking.
Try this patch please:
Index: libselinux/src/label_file.c
===================================================================
--- libselinux/src/label_file.c (revision 2848)
+++ libselinux/src/label_file.c (working copy)
@@ -490,9 +490,8 @@
goto finish;
}
if (NULL == (data->spec_arr =
- malloc(sizeof(spec_t) * data->nspec)))
+ calloc(data->nspec, sizeof(spec_t))))
goto finish;
- memset(data->spec_arr, 0, sizeof(spec_t)*data->nspec);
I don't think we should ever be using calloc or memset on structs, using
malloc and an initializer avoids issues with the struct changing later.
maxnspec = data->nspec;
rewind(fp);
if (homedirfp)
@@ -504,7 +503,7 @@
free(line_buf);
/* Move exact pathname specifications to the end. */
- spec_copy = malloc(sizeof(spec_t) * data->nspec);
+ spec_copy = calloc(data->nspec, sizeof(spec_t));
if (!spec_copy)
goto finish;
j = 0;
Index: libselinux/src/matchpathcon.c
===================================================================
--- libselinux/src/matchpathcon.c (revision 2848)
+++ libselinux/src/matchpathcon.c (working copy)
@@ -284,6 +284,8 @@
int matchpathcon_init_prefix(const char *path, const char *subset)
{
+ matchpathcon_fini();
+
do we really want to trash all the state instead of attempting to use it?
if (!mycanoncon)
mycanoncon = default_canoncon;
Index: libselinux/src/label.c
===================================================================
--- libselinux/src/label.c (revision 2848)
+++ libselinux/src/label.c (working copy)
@@ -95,7 +95,7 @@
if (compat_validate(rec, lr, "file_contexts", 0))
return NULL;
- if (translating &&
+ if (translating && !lr->ctx_trans &&
selinux_raw_to_trans_context(lr->ctx_raw, &lr->ctx_trans))
return NULL;
--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@xxxxxxxxxxxxx with
the words "unsubscribe selinux" without quotes as the message.
