From 4d9adbb8620600923117790d96f2d16717ae0907 Mon Sep 17 00:00:00 2001 From: Bastian Germann Date: Tue, 22 Sep 2020 23:14:37 +0200 Subject: 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 Signed-off-by: David Oberhollenzer --- ubifs-utils/mkfs.ubifs/mkfs.ubifs.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'ubifs-utils') 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; -- cgit v1.2.3