Blame 0002-acl-2.2.52-setfacl-restore-initialize.patch
|
Kamil Dudka |
9089a4 |
From eb123384d1e4001b62a578ec1df53aa23016aed3 Mon Sep 17 00:00:00 2001
|
|
Kamil Dudka |
9089a4 |
From: Andreas Gruenbacher <agruenba@redhat.com>
|
|
Kamil Dudka |
9089a4 |
Date: Fri, 17 Mar 2017 10:17:01 +0100
|
|
Kamil Dudka |
9089a4 |
Subject: [PATCH] setfacl --restore: Silence valgrind
|
|
Kamil Dudka |
9089a4 |
|
|
Kamil Dudka |
9089a4 |
Valgrind complains that setfacl --restore triggers uninitialized memory
|
|
Kamil Dudka |
9089a4 |
accesses to cmd->c_tag and cmd->c_perm of CMD_REMOVE_ACL commands in
|
|
Kamil Dudka |
9089a4 |
do_set (http://savannah.nongnu.org/bugs/?50566). In this case, the
|
|
Kamil Dudka |
9089a4 |
uninitialized memory accesses have no effect. Silence valgrind by
|
|
Kamil Dudka |
9089a4 |
initializing cmd->c_tag and cmd->c_perm anyway.
|
|
Kamil Dudka |
9089a4 |
|
|
Kamil Dudka |
9089a4 |
Upstream-commit: 33f01b5d5bd98fceee0ba46cdbddb60b36fc650e
|
|
Kamil Dudka |
9089a4 |
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
Kamil Dudka |
9089a4 |
---
|
|
Kamil Dudka |
9089a4 |
setfacl/sequence.c | 9 ++++++++-
|
|
Kamil Dudka |
9089a4 |
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
Kamil Dudka |
9089a4 |
|
|
Kamil Dudka |
9089a4 |
diff --git a/setfacl/sequence.c b/setfacl/sequence.c
|
|
Kamil Dudka |
9089a4 |
index a418b23..5ed182e 100644
|
|
Kamil Dudka |
9089a4 |
--- a/setfacl/sequence.c
|
|
Kamil Dudka |
9089a4 |
+++ b/setfacl/sequence.c
|
|
Kamil Dudka |
9089a4 |
@@ -29,7 +29,14 @@ cmd_t
|
|
Kamil Dudka |
9089a4 |
cmd_init(
|
|
Kamil Dudka |
9089a4 |
void)
|
|
Kamil Dudka |
9089a4 |
{
|
|
Kamil Dudka |
9089a4 |
- return (cmd_t)malloc(sizeof(struct cmd_obj));
|
|
Kamil Dudka |
9089a4 |
+ cmd_t cmd;
|
|
Kamil Dudka |
9089a4 |
+
|
|
Kamil Dudka |
9089a4 |
+ cmd = malloc(sizeof(struct cmd_obj));
|
|
Kamil Dudka |
9089a4 |
+ if (cmd) {
|
|
Kamil Dudka |
9089a4 |
+ cmd->c_tag = ACL_UNDEFINED_TAG;
|
|
Kamil Dudka |
9089a4 |
+ cmd->c_perm = 0;
|
|
Kamil Dudka |
9089a4 |
+ }
|
|
Kamil Dudka |
9089a4 |
+ return cmd;
|
|
Kamil Dudka |
9089a4 |
}
|
|
Kamil Dudka |
9089a4 |
|
|
Kamil Dudka |
9089a4 |
|
|
Kamil Dudka |
9089a4 |
--
|
|
Kamil Dudka |
9089a4 |
2.9.4
|
|
Kamil Dudka |
9089a4 |
|