aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastian Germann <bastiangermann@fishpost.de>2020-09-22 23:14:37 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-09-23 13:03:17 +0200
commit4d9adbb8620600923117790d96f2d16717ae0907 (patch)
treeb7b2a57a251a0cac66944e87bafb00243d23cab9
parent763a4b3a17e3fb4ab67c6105e06df891e60471bc (diff)
mkfs.ubifs: Fix build with SELinux
In v2.1.0, SELinux support was introduced. It never compiled with ubifs because it uses the old add_xattr signature that also changed in v2.1.0 with a1bd316e23("mkfs.ubifs: Implement fscrypto context store as xattr"). Add the ubifs_ino_node and name to the call and remove the nm that is contructed in the new function version. Signed-off-by: Bastian Germann <bastiangermann@fishpost.de> Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
-rw-r--r--ubifs-utils/mkfs.ubifs/mkfs.ubifs.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
index cd66d93..8211ada 100644
--- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
+++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
@@ -1411,7 +1411,6 @@ static int inode_add_selinux_xattr(struct ubifs_ino_node *host_ino,
int ret;
char *sepath = NULL;
char *name;
- struct qstr nm;
unsigned int con_size;
if (!context || !sehnd) {
@@ -1442,14 +1441,7 @@ static int inode_add_selinux_xattr(struct ubifs_ino_node *host_ino,
con_size = strlen(secontext) + 1;
name = strdup(XATTR_NAME_SELINUX);
- nm.name = name;
- nm.len = strlen(name);
- host_ino->xattr_cnt++;
- host_ino->xattr_size += CALC_DENT_SIZE(nm.len);
- host_ino->xattr_size += CALC_XATTR_BYTES(con_size);
- host_ino->xattr_names += nm.len;
-
- ret = add_xattr(st, inum, secontext, con_size, &nm);
+ ret = add_xattr(host_ino, st, inum, name, secontext, con_size);
if (ret < 0)
dbg_msg(2, "add_xattr failed %d\n", ret);
return ret;