| Message ID | 20190517165519.11507-3-roberto.sassu@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | initramfs: add support for xattrs in the initial ram disk | expand |
On May 17, 2019 9:55:19 AM PDT, Roberto Sassu <roberto.sassu@huawei.com> wrote: >This patch adds support for an alternative method to add xattrs to >files in >the rootfs filesystem. Instead of extracting them directly from the ram >disk image, they are extracted from a regular file called .xattr-list, >that >can be added by any ram disk generator available today. The file format >is: > ><file #N data len (ASCII, 10 chars)><file #N path>\0 ><xattr #N data len (ASCII, 8 chars)><xattr #N name>\0<xattr #N value> > >.xattr-list can be generated by executing: > >$ getfattr --absolute-names -d -h -R -e hex -m - \ > <file list> | xattr.awk -b > ${initdir}/.xattr-list > >where the content of the xattr.awk script is: > >#! /usr/bin/awk -f >{ > if (!length($0)) { > printf("%.10x%s\0", len, file); > for (x in xattr) { > printf("%.8x%s\0", xattr_len[x], x); > for (i = 0; i < length(xattr[x]) / 2; i++) { > printf("%c", strtonum("0x"substr(xattr[x], i * 2 + 1, 2))); > } > } > i = 0; > delete xattr; > delete xattr_len; > next; > }; > if (i == 0) { > file=$3; > len=length(file) + 8 + 1; > } > if (i > 0) { > split($0, a, "="); > xattr[a[1]]=substr(a[2], 3); > xattr_len[a[1]]=length(a[1]) + 1 + 8 + length(xattr[a[1]]) / 2; > len+=xattr_len[a[1]]; > }; > i++; >} > >Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com> >--- > init/initramfs.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 99 insertions(+) > >diff --git a/init/initramfs.c b/init/initramfs.c >index 0c6dd1d5d3f6..6ec018c6279a 100644 >--- a/init/initramfs.c >+++ b/init/initramfs.c >@@ -13,6 +13,8 @@ > #include <linux/namei.h> > #include <linux/xattr.h> > >+#define XATTR_LIST_FILENAME ".xattr-list" >+ > static ssize_t __init xwrite(int fd, const char *p, size_t count) > { > ssize_t out = 0; >@@ -382,6 +384,97 @@ static int __init __maybe_unused do_setxattrs(char >*pathname) > return 0; > } > >+struct path_hdr { >+ char p_size[10]; /* total size including p_size field */ >+ char p_data[]; /* <path>\0<xattrs> */ >+}; >+ >+static int __init do_readxattrs(void) >+{ >+ struct path_hdr hdr; >+ char *path = NULL; >+ char str[sizeof(hdr.p_size) + 1]; >+ unsigned long file_entry_size; >+ size_t size, path_size, total_size; >+ struct kstat st; >+ struct file *file; >+ loff_t pos; >+ int ret; >+ >+ ret = vfs_lstat(XATTR_LIST_FILENAME, &st); >+ if (ret < 0) >+ return ret; >+ >+ total_size = st.size; >+ >+ file = filp_open(XATTR_LIST_FILENAME, O_RDONLY, 0); >+ if (IS_ERR(file)) >+ return PTR_ERR(file); >+ >+ pos = file->f_pos; >+ >+ while (total_size) { >+ size = kernel_read(file, (char *)&hdr, sizeof(hdr), &pos); >+ if (size != sizeof(hdr)) { >+ ret = -EIO; >+ goto out; >+ } >+ >+ total_size -= size; >+ >+ str[sizeof(hdr.p_size)] = 0; >+ memcpy(str, hdr.p_size, sizeof(hdr.p_size)); >+ ret = kstrtoul(str, 16, &file_entry_size); >+ if (ret < 0) >+ goto out; >+ >+ file_entry_size -= sizeof(sizeof(hdr.p_size)); >+ if (file_entry_size > total_size) { >+ ret = -EINVAL; >+ goto out; >+ } >+ >+ path = vmalloc(file_entry_size); >+ if (!path) { >+ ret = -ENOMEM; >+ goto out; >+ } >+ >+ size = kernel_read(file, path, file_entry_size, &pos); >+ if (size != file_entry_size) { >+ ret = -EIO; >+ goto out_free; >+ } >+ >+ total_size -= size; >+ >+ path_size = strnlen(path, file_entry_size); >+ if (path_size == file_entry_size) { >+ ret = -EINVAL; >+ goto out_free; >+ } >+ >+ xattr_buf = path + path_size + 1; >+ xattr_len = file_entry_size - path_size - 1; >+ >+ ret = do_setxattrs(path); >+ vfree(path); >+ path = NULL; >+ >+ if (ret < 0) >+ break; >+ } >+out_free: >+ vfree(path); >+out: >+ fput(file); >+ >+ if (ret < 0) >+ error("Unable to parse xattrs"); >+ >+ return ret; >+} >+ > static __initdata int wfd; > > static int __init do_name(void) >@@ -391,6 +484,11 @@ static int __init do_name(void) > if (strcmp(collected, "TRAILER!!!") == 0) { > free_hash(); > return 0; >+ } else if (strcmp(collected, XATTR_LIST_FILENAME) == 0) { >+ struct kstat st; >+ >+ if (!vfs_lstat(collected, &st)) >+ do_readxattrs(); > } > clean_path(collected, mode); > if (S_ISREG(mode)) { >@@ -562,6 +660,7 @@ static char * __init unpack_to_rootfs(char *buf, >unsigned long len) > buf += my_inptr; > len -= my_inptr; > } >+ do_readxattrs(); > dir_utime(); > kfree(name_buf); > kfree(symlink_buf); Ok... I just realized this does not work for a modular initramfs, composed at load time from multiple files, which is a very real problem. Should be easy enough to deal with: instead of one large file, use one companion file per source file, perhaps something like filename..xattrs (suggesting double dots to make it less likely to conflict with a "real" file.) No leading dot, as it makes it more likely that archivers will sort them before the file proper. A side benefit is that the format can be simpler as there is no need to encode the filename. A technically cleaner solution still, but which would need archiver modifications, would be to encode the xattrs as an optionally nameless file (just an empty string) with a new file mode value, immediately following the original file. The advantage there is that the archiver itself could support xattrs and other extended metadata (which has been requested elsewhere); the disadvantage obviously is that that it requires new support in the archiver. However, at least it ought to be simpler since it is still a higher protocol level than the cpio archive itself. There's already one special case in cpio, which is the "!!!TRAILER!!!" filename; although I don't think it is part of the formal spec, to the extent there is one, I would expect that in practice it is always encoded with a mode of 0, which incidentally could be used to unbreak the case where such a filename actually exists. So one way to support such extended metadata would be to set mode to 0 and use the filename to encode the type of metadata. I wonder how existing GNU or BSD cpio (the BSD one is better maintained these days) would deal with reading such a file; it would at least not be a regression if it just read it still, possibly with warnings. It could also be possible to use bits 17:16 in the mode, which are traditionally always zero (mode_t being 16 bits), but I believe are present in most or all of the cpio formats for historical reasons. It might be accepted better by existing implementations to use one of these high bits combined with S_IFREG, I dont know.
On Fri, May 17, 2019 at 01:18:11PM -0700, hpa@zytor.com wrote: > > Ok... I just realized this does not work for a modular initramfs, composed at load time from multiple files, which is a very real problem. Should be easy enough to deal with: instead of one large file, use one companion file per source file, perhaps something like filename..xattrs (suggesting double dots to make it less likely to conflict with a "real" file.) No leading dot, as it makes it more likely that archivers will sort them before the file proper. This version of the patch was changed from the previous one exactly to deal with this case -- it allows for the bootloader to load multiple initramfs archives, each with its own .xattr-list file, and to have that work properly. Could you elaborate on the issue that you see?
On Fri, May 17, 2019 at 05:02:20PM -0400, Arvind Sankar wrote: > On Fri, May 17, 2019 at 01:18:11PM -0700, hpa@zytor.com wrote: > > > > Ok... I just realized this does not work for a modular initramfs, composed at load time from multiple files, which is a very real problem. Should be easy enough to deal with: instead of one large file, use one companion file per source file, perhaps something like filename..xattrs (suggesting double dots to make it less likely to conflict with a "real" file.) No leading dot, as it makes it more likely that archivers will sort them before the file proper. > This version of the patch was changed from the previous one exactly to deal with this case -- > it allows for the bootloader to load multiple initramfs archives, each > with its own .xattr-list file, and to have that work properly. > Could you elaborate on the issue that you see? Roberto, are you missing a changelog entry for v2->v3 change?
On 5/17/19 3:18 PM, hpa@zytor.com wrote: > Ok... I just realized this does not work for a modular initramfs, composed at load time from multiple files, which is a very real problem. Should be easy enough to deal with: instead of one large file, use one companion file per source file, perhaps something like filename..xattrs (suggesting double dots to make it less likely to conflict with a "real" file.) No leading dot, as it makes it more likely that archivers will sort them before the file proper. > > A side benefit is that the format can be simpler as there is no need to encode the filename. > > A technically cleaner solution still, but which would need archiver modifications, would be to encode the xattrs as an optionally nameless file (just an empty string) with a new file mode value, immediately following the original file. The advantage there is that the archiver itself could support xattrs and other extended metadata (which has been requested elsewhere); the disadvantage obviously is that that it requires new support in the archiver. However, at least it ought to be simpler since it is still a higher protocol level than the cpio archive itself. > > There's already one special case in cpio, which is the "!!!TRAILER!!!" filename; although I don't think it is part of the formal spec, to the extent there is one, I would expect that in practice it is always encoded with a mode of 0, which incidentally could be used to unbreak the case where such a filename actually exists. So one way to support such extended metadata would be to set mode to 0 and use the filename to encode the type of metadata. I wonder how existing GNU or BSD cpio (the BSD one is better maintained these days) would deal with reading such a file; it would at least not be a regression if it just read it still, possibly with warnings. It could also be possible to use bits 17:16 in the mode, which are traditionally always zero (mode_t being 16 bits), but I believe are present in most or all of the cpio formats for historical reasons. It might be accepted better by existing implementations to use one of these high bits combined with S_IFREG, I dont know. > I'll happily modify toybox cpio to understand xattrs (compress and decompress), the android guys do a lot with xattrs already. I tapped out of _this_ discussion from disgust with the proposed encoding. Rob
On 5/17/19 1:18 PM, hpa@zytor.com wrote: > > Ok... I just realized this does not work for a modular initramfs, composed at load time from multiple files, which is a very real problem. Should be easy enough to deal with: instead of one large file, use one companion file per source file, perhaps something like filename..xattrs (suggesting double dots to make it less likely to conflict with a "real" file.) No leading dot, as it makes it more likely that archivers will sort them before the file proper. > > A side benefit is that the format can be simpler as there is no need to encode the filename. > > A technically cleaner solution still, but which would need archiver modifications, would be to encode the xattrs as an optionally nameless file (just an empty string) with a new file mode value, immediately following the original file. The advantage there is that the archiver itself could support xattrs and other extended metadata (which has been requested elsewhere); the disadvantage obviously is that that it requires new support in the archiver. However, at least it ought to be simpler since it is still a higher protocol level than the cpio archive itself. > > There's already one special case in cpio, which is the "!!!TRAILER!!!" filename; although I don't think it is part of the formal spec, to the extent there is one, I would expect that in practice it is always encoded with a mode of 0, which incidentally could be used to unbreak the case where such a filename actually exists. So one way to support such extended metadata would be to set mode to 0 and use the filename to encode the type of metadata. I wonder how existing GNU or BSD cpio (the BSD one is better maintained these days) would deal with reading such a file; it would at least not be a regression if it just read it still, possibly with warnings. It could also be possible to use bits 17:16 in the mode, which are traditionally always zero (mode_t being 16 bits), but I believe are present in most or all of the cpio formats for historical reasons. It might be accepted better by existing implementations to use one of these high bits combined with S_IFREG, I dont know. > Correction: it's just !!!TRAILER!!!. I tested with GNU cpio, BSD cpio, scpio and pax. With a mode of 0: - GNU cpio errors, but extracts all the other files. - BSD cpio extracts them as regular files. - scpio and pax abort. With a mode of 0x18000 (bit 16 + S_IFREG), all of them happily extracted the data as regular files. -hpa
On 5/17/19 2:02 PM, Arvind Sankar wrote: > On Fri, May 17, 2019 at 01:18:11PM -0700, hpa@zytor.com wrote: >> >> Ok... I just realized this does not work for a modular initramfs, composed at load time from multiple files, which is a very real problem. Should be easy enough to deal with: instead of one large file, use one companion file per source file, perhaps something like filename..xattrs (suggesting double dots to make it less likely to conflict with a "real" file.) No leading dot, as it makes it more likely that archivers will sort them before the file proper. > This version of the patch was changed from the previous one exactly to deal with this case -- > it allows for the bootloader to load multiple initramfs archives, each > with its own .xattr-list file, and to have that work properly. > Could you elaborate on the issue that you see? > Well, for one thing, how do you define "cpio archive", each with its own .xattr-list file? Second, that would seem to depend on the ordering, no, in which case you depend critically on .xattr-list file following the files, which most archivers won't do. Either way it seems cleaner to have this per file; especially if/as it can be done without actually mucking up the format. I need to run, but I'll post a more detailed explanation of what I did in a little bit. -hpa
On Fri, May 17, 2019 at 02:47:31PM -0700, H. Peter Anvin wrote: > On 5/17/19 2:02 PM, Arvind Sankar wrote: > > On Fri, May 17, 2019 at 01:18:11PM -0700, hpa@zytor.com wrote: > >> > >> Ok... I just realized this does not work for a modular initramfs, composed at load time from multiple files, which is a very real problem. Should be easy enough to deal with: instead of one large file, use one companion file per source file, perhaps something like filename..xattrs (suggesting double dots to make it less likely to conflict with a "real" file.) No leading dot, as it makes it more likely that archivers will sort them before the file proper. > > This version of the patch was changed from the previous one exactly to deal with this case -- > > it allows for the bootloader to load multiple initramfs archives, each > > with its own .xattr-list file, and to have that work properly. > > Could you elaborate on the issue that you see? > > > > Well, for one thing, how do you define "cpio archive", each with its own > .xattr-list file? Second, that would seem to depend on the ordering, no, > in which case you depend critically on .xattr-list file following the > files, which most archivers won't do. > > Either way it seems cleaner to have this per file; especially if/as it > can be done without actually mucking up the format. > > I need to run, but I'll post a more detailed explanation of what I did > in a little bit. > > -hpa > Not sure what you mean by how do I define it? Each cpio archive will contain its own .xattr-list file with signatures for the files within it, that was the idea. You need to review the code more closely I think -- it does not depend on the .xattr-list file following the files to which it applies. The code first extracts .xattr-list as though it was a regular file. If a later dupe shows up (presumably from a second archive, although the patch will actually allow a second one in the same archive), it will then process the existing .xattr-list file and apply the attributes listed within it. It then will proceed to read the second one and overwrite the first one with it (this is the normal behaviour in the kernel cpio parser). At the end once all the archives have been extracted, if there is an .xattr-list file in the rootfs it will be parsed (it would've been the last one encountered, which hasn't been parsed yet, just extracted). Regarding the idea to use the high 16 bits of the mode field in the header that's another possibility. It would just require additional support in the program that actually creates the archive though, which the current patch doesn't.
On 5/17/19 4:41 PM, H. Peter Anvin wrote: > On 5/17/19 1:18 PM, hpa@zytor.com wrote: >> >> Ok... I just realized this does not work for a modular initramfs, composed at load time from multiple files, which is a very real problem. Should be easy enough to deal with: instead of one large file, use one companion file per source file, perhaps something like filename..xattrs (suggesting double dots to make it less likely to conflict with a "real" file.) No leading dot, as it makes it more likely that archivers will sort them before the file proper. >> >> A side benefit is that the format can be simpler as there is no need to encode the filename. >> >> A technically cleaner solution still, but which would need archiver modifications, would be to encode the xattrs as an optionally nameless file (just an empty string) with a new file mode value, immediately following the original file. The advantage there is that the archiver itself could support xattrs and other extended metadata (which has been requested elsewhere); the disadvantage obviously is that that it requires new support in the archiver. However, at least it ought to be simpler since it is still a higher protocol level than the cpio archive itself. >> >> There's already one special case in cpio, which is the "!!!TRAILER!!!" filename; although I don't think it is part of the formal spec, to the extent there is one, I would expect that in practice it is always encoded with a mode of 0, which incidentally could be used to unbreak the case where such a filename actually exists. So one way to support such extended metadata would be to set mode to 0 and use the filename to encode the type of metadata. I wonder how existing GNU or BSD cpio (the BSD one is better maintained these days) would deal with reading such a file; it would at least not be a regression if it just read it still, possibly with warnings. It could also be possible to use bits 17:16 in the mode, which are traditionally always zero (mode_t being 16 bits), but I believe are present in most or all of the cpio formats for historical reasons. It might be accepted better by existing implementations to use one of these high bits combined with S_IFREG, I dont know. > > > Correction: it's just !!!TRAILER!!!. We documented it as "TRAILER!!!" without leading !!!, and that its purpose is to flush hardlinks: https://www.kernel.org/doc/Documentation/early-userspace/buffer-format.txt That's what toybox cpio has been producing. Kernel consumes it just fine. Just checked busybox cpio and that's what they're producing as well... Rob
On 5/17/2019 11:10 PM, Arvind Sankar wrote: > On Fri, May 17, 2019 at 05:02:20PM -0400, Arvind Sankar wrote: >> On Fri, May 17, 2019 at 01:18:11PM -0700, hpa@zytor.com wrote: >>> >>> Ok... I just realized this does not work for a modular initramfs, composed at load time from multiple files, which is a very real problem. Should be easy enough to deal with: instead of one large file, use one companion file per source file, perhaps something like filename..xattrs (suggesting double dots to make it less likely to conflict with a "real" file.) No leading dot, as it makes it more likely that archivers will sort them before the file proper. >> This version of the patch was changed from the previous one exactly to deal with this case -- >> it allows for the bootloader to load multiple initramfs archives, each >> with its own .xattr-list file, and to have that work properly. >> Could you elaborate on the issue that you see? > Roberto, are you missing a changelog entry for v2->v3 change? The changelog for v1->v2 is missing. Thanks Roberto
On 5/17/2019 10:18 PM, hpa@zytor.com wrote: > On May 17, 2019 9:55:19 AM PDT, Roberto Sassu <roberto.sassu@huawei.com> wrote: >> This patch adds support for an alternative method to add xattrs to >> files in >> the rootfs filesystem. Instead of extracting them directly from the ram >> disk image, they are extracted from a regular file called .xattr-list, >> that >> can be added by any ram disk generator available today. The file format >> is: >> >> <file #N data len (ASCII, 10 chars)><file #N path>\0 >> <xattr #N data len (ASCII, 8 chars)><xattr #N name>\0<xattr #N value> >> >> .xattr-list can be generated by executing: >> >> $ getfattr --absolute-names -d -h -R -e hex -m - \ >> <file list> | xattr.awk -b > ${initdir}/.xattr-list >> >> where the content of the xattr.awk script is: >> >> #! /usr/bin/awk -f >> { >> if (!length($0)) { >> printf("%.10x%s\0", len, file); >> for (x in xattr) { >> printf("%.8x%s\0", xattr_len[x], x); >> for (i = 0; i < length(xattr[x]) / 2; i++) { >> printf("%c", strtonum("0x"substr(xattr[x], i * 2 + 1, 2))); >> } >> } >> i = 0; >> delete xattr; >> delete xattr_len; >> next; >> }; >> if (i == 0) { >> file=$3; >> len=length(file) + 8 + 1; >> } >> if (i > 0) { >> split($0, a, "="); >> xattr[a[1]]=substr(a[2], 3); >> xattr_len[a[1]]=length(a[1]) + 1 + 8 + length(xattr[a[1]]) / 2; >> len+=xattr_len[a[1]]; >> }; >> i++; >> } >> >> Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com> >> --- >> init/initramfs.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 99 insertions(+) >> >> diff --git a/init/initramfs.c b/init/initramfs.c >> index 0c6dd1d5d3f6..6ec018c6279a 100644 >> --- a/init/initramfs.c >> +++ b/init/initramfs.c >> @@ -13,6 +13,8 @@ >> #include <linux/namei.h> >> #include <linux/xattr.h> >> >> +#define XATTR_LIST_FILENAME ".xattr-list" >> + >> static ssize_t __init xwrite(int fd, const char *p, size_t count) >> { >> ssize_t out = 0; >> @@ -382,6 +384,97 @@ static int __init __maybe_unused do_setxattrs(char >> *pathname) >> return 0; >> } >> >> +struct path_hdr { >> + char p_size[10]; /* total size including p_size field */ >> + char p_data[]; /* <path>\0<xattrs> */ >> +}; >> + >> +static int __init do_readxattrs(void) >> +{ >> + struct path_hdr hdr; >> + char *path = NULL; >> + char str[sizeof(hdr.p_size) + 1]; >> + unsigned long file_entry_size; >> + size_t size, path_size, total_size; >> + struct kstat st; >> + struct file *file; >> + loff_t pos; >> + int ret; >> + >> + ret = vfs_lstat(XATTR_LIST_FILENAME, &st); >> + if (ret < 0) >> + return ret; >> + >> + total_size = st.size; >> + >> + file = filp_open(XATTR_LIST_FILENAME, O_RDONLY, 0); >> + if (IS_ERR(file)) >> + return PTR_ERR(file); >> + >> + pos = file->f_pos; >> + >> + while (total_size) { >> + size = kernel_read(file, (char *)&hdr, sizeof(hdr), &pos); >> + if (size != sizeof(hdr)) { >> + ret = -EIO; >> + goto out; >> + } >> + >> + total_size -= size; >> + >> + str[sizeof(hdr.p_size)] = 0; >> + memcpy(str, hdr.p_size, sizeof(hdr.p_size)); >> + ret = kstrtoul(str, 16, &file_entry_size); >> + if (ret < 0) >> + goto out; >> + >> + file_entry_size -= sizeof(sizeof(hdr.p_size)); >> + if (file_entry_size > total_size) { >> + ret = -EINVAL; >> + goto out; >> + } >> + >> + path = vmalloc(file_entry_size); >> + if (!path) { >> + ret = -ENOMEM; >> + goto out; >> + } >> + >> + size = kernel_read(file, path, file_entry_size, &pos); >> + if (size != file_entry_size) { >> + ret = -EIO; >> + goto out_free; >> + } >> + >> + total_size -= size; >> + >> + path_size = strnlen(path, file_entry_size); >> + if (path_size == file_entry_size) { >> + ret = -EINVAL; >> + goto out_free; >> + } >> + >> + xattr_buf = path + path_size + 1; >> + xattr_len = file_entry_size - path_size - 1; >> + >> + ret = do_setxattrs(path); >> + vfree(path); >> + path = NULL; >> + >> + if (ret < 0) >> + break; >> + } >> +out_free: >> + vfree(path); >> +out: >> + fput(file); >> + >> + if (ret < 0) >> + error("Unable to parse xattrs"); >> + >> + return ret; >> +} >> + >> static __initdata int wfd; >> >> static int __init do_name(void) >> @@ -391,6 +484,11 @@ static int __init do_name(void) >> if (strcmp(collected, "TRAILER!!!") == 0) { >> free_hash(); >> return 0; >> + } else if (strcmp(collected, XATTR_LIST_FILENAME) == 0) { >> + struct kstat st; >> + >> + if (!vfs_lstat(collected, &st)) >> + do_readxattrs(); >> } >> clean_path(collected, mode); >> if (S_ISREG(mode)) { >> @@ -562,6 +660,7 @@ static char * __init unpack_to_rootfs(char *buf, >> unsigned long len) >> buf += my_inptr; >> len -= my_inptr; >> } >> + do_readxattrs(); >> dir_utime(); >> kfree(name_buf); >> kfree(symlink_buf); > > Ok... I just realized this does not work for a modular initramfs, composed at load time from multiple files, which is a very real problem. Should be easy enough to deal with: instead of one large file, use one companion file per source file, perhaps something like filename..xattrs (suggesting double dots to make it less likely to conflict with a "real" file.) No leading dot, as it makes it more likely that archivers will sort them before the file proper. Version 1 of the patch set worked exactly in this way. However, Rob pointed out that this would be a problem if file names plus the suffix exceed 255 characters. Roberto
On 5/18/2019 12:17 AM, Arvind Sankar wrote: > On Fri, May 17, 2019 at 02:47:31PM -0700, H. Peter Anvin wrote: >> On 5/17/19 2:02 PM, Arvind Sankar wrote: >>> On Fri, May 17, 2019 at 01:18:11PM -0700, hpa@zytor.com wrote: >>>> >>>> Ok... I just realized this does not work for a modular initramfs, composed at load time from multiple files, which is a very real problem. Should be easy enough to deal with: instead of one large file, use one companion file per source file, perhaps something like filename..xattrs (suggesting double dots to make it less likely to conflict with a "real" file.) No leading dot, as it makes it more likely that archivers will sort them before the file proper. >>> This version of the patch was changed from the previous one exactly to deal with this case -- >>> it allows for the bootloader to load multiple initramfs archives, each >>> with its own .xattr-list file, and to have that work properly. >>> Could you elaborate on the issue that you see? >>> >> >> Well, for one thing, how do you define "cpio archive", each with its own >> .xattr-list file? Second, that would seem to depend on the ordering, no, >> in which case you depend critically on .xattr-list file following the >> files, which most archivers won't do. >> >> Either way it seems cleaner to have this per file; especially if/as it >> can be done without actually mucking up the format. >> >> I need to run, but I'll post a more detailed explanation of what I did >> in a little bit. >> >> -hpa >> > Not sure what you mean by how do I define it? Each cpio archive will > contain its own .xattr-list file with signatures for the files within > it, that was the idea. > > You need to review the code more closely I think -- it does not depend > on the .xattr-list file following the files to which it applies. > > The code first extracts .xattr-list as though it was a regular file. If > a later dupe shows up (presumably from a second archive, although the > patch will actually allow a second one in the same archive), it will > then process the existing .xattr-list file and apply the attributes > listed within it. It then will proceed to read the second one and > overwrite the first one with it (this is the normal behaviour in the > kernel cpio parser). At the end once all the archives have been > extracted, if there is an .xattr-list file in the rootfs it will be > parsed (it would've been the last one encountered, which hasn't been > parsed yet, just extracted). > > Regarding the idea to use the high 16 bits of the mode field in > the header that's another possibility. It would just require additional > support in the program that actually creates the archive though, which > the current patch doesn't. Yes, for adding signatures for a subset of files, no changes to the ram disk generator are necessary. Everything is done by a custom module. To support a generic use case, it would be necessary to modify the generator to execute getfattr and the awk script after files have been placed in the temporary directory. If I understood the new proposal correctly, it would be task for cpio to read file metadata after the content and create a new record for each file with mode 0x18000, type of metadata encoded in the file name and metadata as file content. I don't know how easy it would be to modify cpio. Probably the amount of changes would be reasonable. The kernel will behave in a similar way. It will call do_readxattrs() in do_copy() for each file. Since the only difference between the current and the new proposal would be two additional calls to do_readxattrs() in do_name() and unpack_to_rootfs(), maybe we could support both. Roberto
On May 20, 2019 2:39:46 AM PDT, Roberto Sassu <roberto.sassu@huawei.com> wrote: >On 5/18/2019 12:17 AM, Arvind Sankar wrote: >> On Fri, May 17, 2019 at 02:47:31PM -0700, H. Peter Anvin wrote: >>> On 5/17/19 2:02 PM, Arvind Sankar wrote: >>>> On Fri, May 17, 2019 at 01:18:11PM -0700, hpa@zytor.com wrote: >>>>> >>>>> Ok... I just realized this does not work for a modular initramfs, >composed at load time from multiple files, which is a very real >problem. Should be easy enough to deal with: instead of one large file, >use one companion file per source file, perhaps something like >filename..xattrs (suggesting double dots to make it less likely to >conflict with a "real" file.) No leading dot, as it makes it more >likely that archivers will sort them before the file proper. >>>> This version of the patch was changed from the previous one exactly >to deal with this case -- >>>> it allows for the bootloader to load multiple initramfs archives, >each >>>> with its own .xattr-list file, and to have that work properly. >>>> Could you elaborate on the issue that you see? >>>> >>> >>> Well, for one thing, how do you define "cpio archive", each with its >own >>> .xattr-list file? Second, that would seem to depend on the ordering, >no, >>> in which case you depend critically on .xattr-list file following >the >>> files, which most archivers won't do. >>> >>> Either way it seems cleaner to have this per file; especially if/as >it >>> can be done without actually mucking up the format. >>> >>> I need to run, but I'll post a more detailed explanation of what I >did >>> in a little bit. >>> >>> -hpa >>> >> Not sure what you mean by how do I define it? Each cpio archive will >> contain its own .xattr-list file with signatures for the files within >> it, that was the idea. >> >> You need to review the code more closely I think -- it does not >depend >> on the .xattr-list file following the files to which it applies. >> >> The code first extracts .xattr-list as though it was a regular file. >If >> a later dupe shows up (presumably from a second archive, although the >> patch will actually allow a second one in the same archive), it will >> then process the existing .xattr-list file and apply the attributes >> listed within it. It then will proceed to read the second one and >> overwrite the first one with it (this is the normal behaviour in the >> kernel cpio parser). At the end once all the archives have been >> extracted, if there is an .xattr-list file in the rootfs it will be >> parsed (it would've been the last one encountered, which hasn't been >> parsed yet, just extracted). >> >> Regarding the idea to use the high 16 bits of the mode field in >> the header that's another possibility. It would just require >additional >> support in the program that actually creates the archive though, >which >> the current patch doesn't. > >Yes, for adding signatures for a subset of files, no changes to the ram >disk generator are necessary. Everything is done by a custom module. To >support a generic use case, it would be necessary to modify the >generator to execute getfattr and the awk script after files have been >placed in the temporary directory. > >If I understood the new proposal correctly, it would be task for cpio >to >read file metadata after the content and create a new record for each >file with mode 0x18000, type of metadata encoded in the file name and >metadata as file content. I don't know how easy it would be to modify >cpio. Probably the amount of changes would be reasonable. > >The kernel will behave in a similar way. It will call do_readxattrs() >in >do_copy() for each file. Since the only difference between the current >and the new proposal would be two additional calls to do_readxattrs() >in >do_name() and unpack_to_rootfs(), maybe we could support both. > >Roberto The nice thing with explicit metadata is that it doesn't have to contain the filename per se, and each file is self-contained. There is a reason why each cpio header starts with the magic number: each cpio record is formally independent and can be processed in isolation. The TRAILER!!! thing is a huge wart in the format, although in practice TRAILER!!! always has a mode of 0 and so can be distinguished from an actual file. The use of mode 0x18000 for metadata allows for optional backwards compatibility for extraction; for encoding this can be handled with very simple postprocessing. So my suggestion would be to have mode 0x18000 indicate extended file metadata, with the filename of the form: optional_filename!XXXXX! ... where XXXXX indicates the type of metadata (e.g. !XATTR!). The optional_filename prefix allows an unaware decoder to extract to a well-defined name; simple postprocessing would be able to either remove (for size) or add (for compatibility) this prefix. It would be an error for this prefix, if present, to not match the name of the previous file. I do agree that the delayed processing of an .xattr-list as you describe ought to work even with a modular initramfs.
On May 17, 2019 7:16:04 PM PDT, Rob Landley <rob@landley.net> wrote: >On 5/17/19 4:41 PM, H. Peter Anvin wrote: >> On 5/17/19 1:18 PM, hpa@zytor.com wrote: >>> >>> Ok... I just realized this does not work for a modular initramfs, >composed at load time from multiple files, which is a very real >problem. Should be easy enough to deal with: instead of one large file, >use one companion file per source file, perhaps something like >filename..xattrs (suggesting double dots to make it less likely to >conflict with a "real" file.) No leading dot, as it makes it more >likely that archivers will sort them before the file proper. >>> >>> A side benefit is that the format can be simpler as there is no need >to encode the filename. >>> >>> A technically cleaner solution still, but which would need archiver >modifications, would be to encode the xattrs as an optionally nameless >file (just an empty string) with a new file mode value, immediately >following the original file. The advantage there is that the archiver >itself could support xattrs and other extended metadata (which has been >requested elsewhere); the disadvantage obviously is that that it >requires new support in the archiver. However, at least it ought to be >simpler since it is still a higher protocol level than the cpio archive >itself. >>> >>> There's already one special case in cpio, which is the >"!!!TRAILER!!!" filename; although I don't think it is part of the >formal spec, to the extent there is one, I would expect that in >practice it is always encoded with a mode of 0, which incidentally >could be used to unbreak the case where such a filename actually >exists. So one way to support such extended metadata would be to set >mode to 0 and use the filename to encode the type of metadata. I wonder >how existing GNU or BSD cpio (the BSD one is better maintained these >days) would deal with reading such a file; it would at least not be a >regression if it just read it still, possibly with warnings. It could >also be possible to use bits 17:16 in the mode, which are traditionally >always zero (mode_t being 16 bits), but I believe are present in most >or all of the cpio formats for historical reasons. It might be accepted >better by existing implementations to use one of these high bits >combined with S_IFREG, I dont know. >> >> >> Correction: it's just !!!TRAILER!!!. > >We documented it as "TRAILER!!!" without leading !!!, and that its >purpose is to >flush hardlinks: > >https://www.kernel.org/doc/Documentation/early-userspace/buffer-format.txt > >That's what toybox cpio has been producing. Kernel consumes it just >fine. Just >checked busybox cpio and that's what they're producing as well... > >Rob Yes, TRAILER!!! is correct. Somehow I managed to get it wrong twice.
On 5/22/2019 6:17 PM, hpa@zytor.com wrote: > On May 20, 2019 2:39:46 AM PDT, Roberto Sassu <roberto.sassu@huawei.com> wrote: >> On 5/18/2019 12:17 AM, Arvind Sankar wrote: >>> On Fri, May 17, 2019 at 02:47:31PM -0700, H. Peter Anvin wrote: >>>> On 5/17/19 2:02 PM, Arvind Sankar wrote: >>>>> On Fri, May 17, 2019 at 01:18:11PM -0700, hpa@zytor.com wrote: >>>>>> >>>>>> Ok... I just realized this does not work for a modular initramfs, >> composed at load time from multiple files, which is a very real >> problem. Should be easy enough to deal with: instead of one large file, >> use one companion file per source file, perhaps something like >> filename..xattrs (suggesting double dots to make it less likely to >> conflict with a "real" file.) No leading dot, as it makes it more >> likely that archivers will sort them before the file proper. >>>>> This version of the patch was changed from the previous one exactly >> to deal with this case -- >>>>> it allows for the bootloader to load multiple initramfs archives, >> each >>>>> with its own .xattr-list file, and to have that work properly. >>>>> Could you elaborate on the issue that you see? >>>>> >>>> >>>> Well, for one thing, how do you define "cpio archive", each with its >> own >>>> .xattr-list file? Second, that would seem to depend on the ordering, >> no, >>>> in which case you depend critically on .xattr-list file following >> the >>>> files, which most archivers won't do. >>>> >>>> Either way it seems cleaner to have this per file; especially if/as >> it >>>> can be done without actually mucking up the format. >>>> >>>> I need to run, but I'll post a more detailed explanation of what I >> did >>>> in a little bit. >>>> >>>> -hpa >>>> >>> Not sure what you mean by how do I define it? Each cpio archive will >>> contain its own .xattr-list file with signatures for the files within >>> it, that was the idea. >>> >>> You need to review the code more closely I think -- it does not >> depend >>> on the .xattr-list file following the files to which it applies. >>> >>> The code first extracts .xattr-list as though it was a regular file. >> If >>> a later dupe shows up (presumably from a second archive, although the >>> patch will actually allow a second one in the same archive), it will >>> then process the existing .xattr-list file and apply the attributes >>> listed within it. It then will proceed to read the second one and >>> overwrite the first one with it (this is the normal behaviour in the >>> kernel cpio parser). At the end once all the archives have been >>> extracted, if there is an .xattr-list file in the rootfs it will be >>> parsed (it would've been the last one encountered, which hasn't been >>> parsed yet, just extracted). >>> >>> Regarding the idea to use the high 16 bits of the mode field in >>> the header that's another possibility. It would just require >> additional >>> support in the program that actually creates the archive though, >> which >>> the current patch doesn't. >> >> Yes, for adding signatures for a subset of files, no changes to the ram >> disk generator are necessary. Everything is done by a custom module. To >> support a generic use case, it would be necessary to modify the >> generator to execute getfattr and the awk script after files have been >> placed in the temporary directory. >> >> If I understood the new proposal correctly, it would be task for cpio >> to >> read file metadata after the content and create a new record for each >> file with mode 0x18000, type of metadata encoded in the file name and >> metadata as file content. I don't know how easy it would be to modify >> cpio. Probably the amount of changes would be reasonable. >> >> The kernel will behave in a similar way. It will call do_readxattrs() >> in >> do_copy() for each file. Since the only difference between the current >> and the new proposal would be two additional calls to do_readxattrs() >> in >> do_name() and unpack_to_rootfs(), maybe we could support both. >> >> Roberto > > The nice thing with explicit metadata is that it doesn't have to contain the filename per se, and each file is self-contained. There is a reason why each cpio header starts with the magic number: each cpio record is formally independent and can be processed in isolation. The TRAILER!!! thing is a huge wart in the format, although in practice TRAILER!!! always has a mode of 0 and so can be distinguished from an actual file. > > The use of mode 0x18000 for metadata allows for optional backwards compatibility for extraction; for encoding this can be handled with very simple postprocessing. > > So my suggestion would be to have mode 0x18000 indicate extended file metadata, with the filename of the form: > > optional_filename!XXXXX! > > ... where XXXXX indicates the type of metadata (e.g. !XATTR!). The optional_filename prefix allows an unaware decoder to extract to a well-defined name; simple postprocessing would be able to either remove (for size) or add (for compatibility) this prefix. It would be an error for this prefix, if present, to not match the name of the previous file. Actually, I defined '..metadata..' as special name to indicate that the file contains metadata. Then, the content of the file is a set of: struct metadata_hdr { char c_size[8]; /* total size including c_size field */ char c_version; /* header version */ char c_type; /* metadata type */ char c_metadata[]; /* metadata */ } __packed; init/initramfs.c now has a specific parser for c_type. Currently, I implemented a parser for xattrs, which expects data in the format: <xattr #N name>\0<xattr #N value> I checked if it is possible to use bit 17:16 to identify files with metadata, but both the cpio and the kernel use unsigned short. I already modified gen_init_cpio and cpio. I modify at run-time the list of files to be included in the image by adding a temporary file, that each time is set with the xattrs of the previously processed file. The output of cpio -t looks like: -- . ..metadata.. bin ..metadata.. dev ..metadata.. dev/console ..metadata.. -- Would it be ok? If you prefer that I add the format to the file name or you/anyone has a comment about this proposal, please let me know so that I make the changes before sending a new version of the patch set. Thanks Roberto
On 5/22/19 11:17 AM, hpa@zytor.com wrote: > On May 20, 2019 2:39:46 AM PDT, Roberto Sassu <roberto.sassu@huawei.com> wrote: >> On 5/18/2019 12:17 AM, Arvind Sankar wrote: >>> On Fri, May 17, 2019 at 02:47:31PM -0700, H. Peter Anvin wrote: >>>> On 5/17/19 2:02 PM, Arvind Sankar wrote: >>>>> On Fri, May 17, 2019 at 01:18:11PM -0700, hpa@zytor.com wrote: >>>>>> >>>>>> Ok... I just realized this does not work for a modular initramfs, >> composed at load time from multiple files, which is a very real >> problem. Should be easy enough to deal with: instead of one large file, >> use one companion file per source file, perhaps something like >> filename..xattrs (suggesting double dots to make it less likely to >> conflict with a "real" file.) No leading dot, as it makes it more >> likely that archivers will sort them before the file proper. >>>>> This version of the patch was changed from the previous one exactly >> to deal with this case -- >>>>> it allows for the bootloader to load multiple initramfs archives, >> each >>>>> with its own .xattr-list file, and to have that work properly. >>>>> Could you elaborate on the issue that you see? >>>>> >>>> >>>> Well, for one thing, how do you define "cpio archive", each with its >> own >>>> .xattr-list file? Second, that would seem to depend on the ordering, >> no, >>>> in which case you depend critically on .xattr-list file following >> the >>>> files, which most archivers won't do. >>>> >>>> Either way it seems cleaner to have this per file; especially if/as >> it >>>> can be done without actually mucking up the format. >>>> >>>> I need to run, but I'll post a more detailed explanation of what I >> did >>>> in a little bit. >>>> >>>> -hpa >>>> >>> Not sure what you mean by how do I define it? Each cpio archive will >>> contain its own .xattr-list file with signatures for the files within >>> it, that was the idea. >>> >>> You need to review the code more closely I think -- it does not >> depend >>> on the .xattr-list file following the files to which it applies. >>> >>> The code first extracts .xattr-list as though it was a regular file. >> If >>> a later dupe shows up (presumably from a second archive, although the >>> patch will actually allow a second one in the same archive), it will >>> then process the existing .xattr-list file and apply the attributes >>> listed within it. It then will proceed to read the second one and >>> overwrite the first one with it (this is the normal behaviour in the >>> kernel cpio parser). At the end once all the archives have been >>> extracted, if there is an .xattr-list file in the rootfs it will be >>> parsed (it would've been the last one encountered, which hasn't been >>> parsed yet, just extracted). >>> >>> Regarding the idea to use the high 16 bits of the mode field in >>> the header that's another possibility. It would just require >> additional >>> support in the program that actually creates the archive though, >> which >>> the current patch doesn't. >> >> Yes, for adding signatures for a subset of files, no changes to the ram >> disk generator are necessary. Everything is done by a custom module. To >> support a generic use case, it would be necessary to modify the >> generator to execute getfattr and the awk script after files have been >> placed in the temporary directory. >> >> If I understood the new proposal correctly, it would be task for cpio >> to >> read file metadata after the content and create a new record for each >> file with mode 0x18000, type of metadata encoded in the file name and >> metadata as file content. I don't know how easy it would be to modify >> cpio. Probably the amount of changes would be reasonable. I could make toybox cpio do it in a weekend, and could probably throw a patch at usr/gen_init_cpio.c while I'm at it. I prototyped something like that a couple years ago, it's not hard. The real question is scripts/gen_initramfs_list.sh and the text format it produces. We can currently generate cpio files with different ownership and permissions than the host system can represent (when not building as root, on a filesystem that may not support xattrs or would get unhappy about conflicting selinux annotations). We work around it by having the metadata represented textually in the initramfs_list file gen_initramfs_list.sh produces and gen_init_cpio.c consumes. xattrs are a terrible idea the Macintosh invented so Finder could remember where you moved a file's icon in its folder without having to modify the file, and then things like OS/2 copied it and Windows picked it up from there and went "Of course, this is a security mechanism!" and... sigh. This is "data that is not data", it's metadata of unbounded size. It seems like it should go in gen_initramfs_list.sh but as what, keyword=value pairs that might have embedded newlines in them? A base64 encoding? Something else? >> The kernel will behave in a similar way. It will call do_readxattrs() >> in >> do_copy() for each file. Since the only difference between the current >> and the new proposal would be two additional calls to do_readxattrs() >> in >> do_name() and unpack_to_rootfs(), maybe we could support both. >> >> Roberto > > The nice thing with explicit metadata is that it doesn't have to contain the filename per se, and each file is self-contained. There is a reason why each cpio header starts with the magic number: each cpio record is formally independent and can be processed in isolation. The TRAILER!!! thing is a huge wart in the format, although in practice TRAILER!!! always has a mode of 0 and so can be distinguished from an actual file. Not adding the requirement that the cpio.gz must be generated as root from a filesystem with the same users and selinux rules as the target system would be nice. > The use of mode 0x18000 for metadata allows for optional backwards compatibility for extraction; for encoding this can be handled with very simple postprocessing. The representation within the cpio file was never a huge deal to me. 0x18000 sounds fine for that. > So my suggestion would be to have mode 0x18000 indicate extended file metadata, with the filename of the form: > > optional_filename!XXXXX! > > ... where XXXXX indicates the type of metadata (e.g. !XATTR!). The optional_filename prefix allows an unaware decoder to extract to a well-defined name; simple postprocessing would be able to either remove (for size) or add (for compatibility) this prefix. It would be an error for this prefix, if present, to not match the name of the previous file. I'd suggest METADATA!!! to look like TRAILER!!!. (METADATA!!!XXXXX! if you really think a keyword=value pair store is _not_ universal and we're going to invent entire new _categories_ of this side channel nonsense.) And extracting conflicting filenames is presumably already covered, it either replaces or the new one fails to create the file and the extractor moves on. (You need a working error recovery path that skips the right amount of data so you can handle the next file properly, but you should have that anyway.) Rob
Quoting Rob Landley (2019-05-22 12:26:43) > > > On 5/22/19 11:17 AM, hpa@zytor.com wrote: > > On May 20, 2019 2:39:46 AM PDT, Roberto Sassu <roberto.sassu@huawei.com> wrote: > >> On 5/18/2019 12:17 AM, Arvind Sankar wrote: > >>> On Fri, May 17, 2019 at 02:47:31PM -0700, H. Peter Anvin wrote: > >>>> On 5/17/19 2:02 PM, Arvind Sankar wrote: > >>>>> On Fri, May 17, 2019 at 01:18:11PM -0700, hpa@zytor.com wrote: > >>>>>> > >>>>>> Ok... I just realized this does not work for a modular initramfs, > >> composed at load time from multiple files, which is a very real > >> problem. Should be easy enough to deal with: instead of one large file, > >> use one companion file per source file, perhaps something like > >> filename..xattrs (suggesting double dots to make it less likely to > >> conflict with a "real" file.) No leading dot, as it makes it more > >> likely that archivers will sort them before the file proper. > >>>>> This version of the patch was changed from the previous one exactly > >> to deal with this case -- > >>>>> it allows for the bootloader to load multiple initramfs archives, > >> each > >>>>> with its own .xattr-list file, and to have that work properly. > >>>>> Could you elaborate on the issue that you see? > >>>>> > >>>> > >>>> Well, for one thing, how do you define "cpio archive", each with its > >> own > >>>> .xattr-list file? Second, that would seem to depend on the ordering, > >> no, > >>>> in which case you depend critically on .xattr-list file following > >> the > >>>> files, which most archivers won't do. > >>>> > >>>> Either way it seems cleaner to have this per file; especially if/as > >> it > >>>> can be done without actually mucking up the format. > >>>> > >>>> I need to run, but I'll post a more detailed explanation of what I > >> did > >>>> in a little bit. > >>>> > >>>> -hpa > >>>> > >>> Not sure what you mean by how do I define it? Each cpio archive will > >>> contain its own .xattr-list file with signatures for the files within > >>> it, that was the idea. > >>> > >>> You need to review the code more closely I think -- it does not > >> depend > >>> on the .xattr-list file following the files to which it applies. > >>> > >>> The code first extracts .xattr-list as though it was a regular file. > >> If > >>> a later dupe shows up (presumably from a second archive, although the > >>> patch will actually allow a second one in the same archive), it will > >>> then process the existing .xattr-list file and apply the attributes > >>> listed within it. It then will proceed to read the second one and > >>> overwrite the first one with it (this is the normal behaviour in the > >>> kernel cpio parser). At the end once all the archives have been > >>> extracted, if there is an .xattr-list file in the rootfs it will be > >>> parsed (it would've been the last one encountered, which hasn't been > >>> parsed yet, just extracted). > >>> > >>> Regarding the idea to use the high 16 bits of the mode field in > >>> the header that's another possibility. It would just require > >> additional > >>> support in the program that actually creates the archive though, > >> which > >>> the current patch doesn't. > >> > >> Yes, for adding signatures for a subset of files, no changes to the ram > >> disk generator are necessary. Everything is done by a custom module. To > >> support a generic use case, it would be necessary to modify the > >> generator to execute getfattr and the awk script after files have been > >> placed in the temporary directory. > >> > >> If I understood the new proposal correctly, it would be task for cpio > >> to > >> read file metadata after the content and create a new record for each > >> file with mode 0x18000, type of metadata encoded in the file name and > >> metadata as file content. I don't know how easy it would be to modify > >> cpio. Probably the amount of changes would be reasonable. > > I could make toybox cpio do it in a weekend, and could probably throw a patch at > usr/gen_init_cpio.c while I'm at it. I prototyped something like that a couple > years ago, it's not hard. > > The real question is scripts/gen_initramfs_list.sh and the text format it > produces. We can currently generate cpio files with different ownership and > permissions than the host system can represent (when not building as root, on a > filesystem that may not support xattrs or would get unhappy about conflicting > selinux annotations). We work around it by having the metadata represented > textually in the initramfs_list file gen_initramfs_list.sh produces and > gen_init_cpio.c consumes. > > xattrs are a terrible idea the Macintosh invented so Finder could remember where > you moved a file's icon in its folder without having to modify the file, and > then things like OS/2 copied it and Windows picked it up from there and went "Of > course, this is a security mechanism!" and... sigh. > > This is "data that is not data", it's metadata of unbounded size. It seems like > it should go in gen_initramfs_list.sh but as what, keyword=value pairs that > might have embedded newlines in them? A base64 encoding? Something else? I the previous try to add xattrs to cpio I've used hex encoding in gen_initramfs_list.sh: https://lkml.org/lkml/2018/1/24/851 - gen_init_cpio: set extended attributes for newcx format https://lkml.org/lkml/2018/1/24/852 - gen_initramfs_list.sh: add -x option to enable newcx format
diff --git a/init/initramfs.c b/init/initramfs.c index 0c6dd1d5d3f6..6ec018c6279a 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -13,6 +13,8 @@ #include <linux/namei.h> #include <linux/xattr.h> +#define XATTR_LIST_FILENAME ".xattr-list" + static ssize_t __init xwrite(int fd, const char *p, size_t count) { ssize_t out = 0; @@ -382,6 +384,97 @@ static int __init __maybe_unused do_setxattrs(char *pathname) return 0; } +struct path_hdr { + char p_size[10]; /* total size including p_size field */ + char p_data[]; /* <path>\0<xattrs> */ +}; + +static int __init do_readxattrs(void) +{ + struct path_hdr hdr; + char *path = NULL; + char str[sizeof(hdr.p_size) + 1]; + unsigned long file_entry_size; + size_t size, path_size, total_size; + struct kstat st; + struct file *file; + loff_t pos; + int ret; + + ret = vfs_lstat(XATTR_LIST_FILENAME, &st); + if (ret < 0) + return ret; + + total_size = st.size; + + file = filp_open(XATTR_LIST_FILENAME, O_RDONLY, 0); + if (IS_ERR(file)) + return PTR_ERR(file); + + pos = file->f_pos; + + while (total_size) { + size = kernel_read(file, (char *)&hdr, sizeof(hdr), &pos); + if (size != sizeof(hdr)) { + ret = -EIO; + goto out; + } + + total_size -= size; + + str[sizeof(hdr.p_size)] = 0; + memcpy(str, hdr.p_size, sizeof(hdr.p_size)); + ret = kstrtoul(str, 16, &file_entry_size); + if (ret < 0) + goto out; + + file_entry_size -= sizeof(sizeof(hdr.p_size)); + if (file_entry_size > total_size) { + ret = -EINVAL; + goto out; + } + + path = vmalloc(file_entry_size); + if (!path) { + ret = -ENOMEM; + goto out; + } + + size = kernel_read(file, path, file_entry_size, &pos); + if (size != file_entry_size) { + ret = -EIO; + goto out_free; + } + + total_size -= size; + + path_size = strnlen(path, file_entry_size); + if (path_size == file_entry_size) { + ret = -EINVAL; + goto out_free; + } + + xattr_buf = path + path_size + 1; + xattr_len = file_entry_size - path_size - 1; + + ret = do_setxattrs(path); + vfree(path); + path = NULL; + + if (ret < 0) + break; + } +out_free: + vfree(path); +out: + fput(file); + + if (ret < 0) + error("Unable to parse xattrs"); + + return ret; +} + static __initdata int wfd; static int __init do_name(void) @@ -391,6 +484,11 @@ static int __init do_name(void) if (strcmp(collected, "TRAILER!!!") == 0) { free_hash(); return 0; + } else if (strcmp(collected, XATTR_LIST_FILENAME) == 0) { + struct kstat st; + + if (!vfs_lstat(collected, &st)) + do_readxattrs(); } clean_path(collected, mode); if (S_ISREG(mode)) { @@ -562,6 +660,7 @@ static char * __init unpack_to_rootfs(char *buf, unsigned long len) buf += my_inptr; len -= my_inptr; } + do_readxattrs(); dir_utime(); kfree(name_buf); kfree(symlink_buf);
This patch adds support for an alternative method to add xattrs to files in the rootfs filesystem. Instead of extracting them directly from the ram disk image, they are extracted from a regular file called .xattr-list, that can be added by any ram disk generator available today. The file format is: <file #N data len (ASCII, 10 chars)><file #N path>\0 <xattr #N data len (ASCII, 8 chars)><xattr #N name>\0<xattr #N value> .xattr-list can be generated by executing: $ getfattr --absolute-names -d -h -R -e hex -m - \ <file list> | xattr.awk -b > ${initdir}/.xattr-list where the content of the xattr.awk script is: #! /usr/bin/awk -f { if (!length($0)) { printf("%.10x%s\0", len, file); for (x in xattr) { printf("%.8x%s\0", xattr_len[x], x); for (i = 0; i < length(xattr[x]) / 2; i++) { printf("%c", strtonum("0x"substr(xattr[x], i * 2 + 1, 2))); } } i = 0; delete xattr; delete xattr_len; next; }; if (i == 0) { file=$3; len=length(file) + 8 + 1; } if (i > 0) { split($0, a, "="); xattr[a[1]]=substr(a[2], 3); xattr_len[a[1]]=length(a[1]) + 1 + 8 + length(xattr[a[1]]) / 2; len+=xattr_len[a[1]]; }; i++; } Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com> --- init/initramfs.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+)