efivarfs: fix ability to mimic uncommitted variables
Subsystems (4)
cover efivarfs: fix ability to mimic uncommitted variables
The use of simple_setattr in efivarfs means that anyone who can write to the variable (which is usually only root) can set the cached inode size to an arbitrary value (including truncating it to zero). This value, while not transmitted on to the underlying variable, does show up on stat and means that anyone who can write to the variable file can also make any variable mimic an uncommitted one (a variable with zero size) which is checked by certain programmes that use EFI variables, like systemd. This problem can be fixed by not allowing anything except a successful variable update to change the inode size.
I also added a regression test to make sure the problem behaviour isn't reintroduced.
James
---
James Bottomley (2):
efivarfs: prevent setting of zero size on the inodes in the cache selftests/efivarfs: add check for disallowing file truncation
fs/efivarfs/inode.c | 17 +++++++++++++++ tools/testing/selftests/efivarfs/efivarfs.sh | 23 ++++++++++++++++++++ 2 files changed, 40 insertions(+)
Signature · 1 line
2.35.3
PATCH 1/2 efivarfs: prevent setting of zero size on the inodes in the cache
Current efivarfs uses simple_setattr which allows the setting of any size in the inode cache. This is wrong because a zero size file is used to indicate an "uncommitted" variable, so by simple means of truncating the file (as root) any variable may be turned to look like it's uncommitted. Fix by adding an efivarfs_setattr routine which does not allow updating of the cached inode size (which now only comes from the underlying variable).
--- fs/efivarfs/inode.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
fs/efivarfs/inode.c +17 -0
@@ -187,7 +187,24 @@ efivarfs_fileattr_set(struct mnt_idmap *idmap,return 0 ; } +/* copy of simple_setattr except that it doesn't do i_size updates */ +static int efivarfs_setattr (struct mnt_idmap *idmap,struct dentry *dentry, +struct iattr *iattr) +{ +struct inode *inode =d_inode (dentry); +int error; + + error =setattr_prepare (idmap, dentry, iattr); +if (error) +return error; + +setattr_copy (idmap, inode, iattr); +mark_inode_dirty (inode); +return 0 ; +} +static const struct inode_operations efivarfs_file_inode_operations = { .fileattr_get = efivarfs_fileattr_get, .fileattr_set = efivarfs_fileattr_set, + .setattr = efivarfs_setattr, };
Signature · 1 line
2.35.3
Ard Biesheuvel
maintainerRe: [PATCH 1/2] efivarfs: prevent setting of zero size on the inodes in the cache
Quoted 33 lines · James Bottomley
Current efivarfs uses
simple_setattrwhich allows the setting of any size in the inode cache. This is wrong because a zero size file is used to indicate an "uncommitted" variable, so by simple means of truncating the file (as root) any variable may be turned to look like it's uncommitted. Fix by adding anefivarfs_setattrroutine which does not allow updating of the cached inode size (which now only comes from the underlying variable).Signed-off-by James Bottomley <[email protected]>--- fs/efivarfs/inode.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)fs/efivarfs/inode.c +11
-0@@ -187,7 +187,24 @@ efivarfs_fileattr_set(struct mnt_idmap *idmap,return 0 ; } +/* copy of simple_setattr except that it doesn't do i_size updates */ +static int efivarfs_setattr (struct mnt_idmap *idmap,struct dentry *dentry, +struct iattr *iattr) +{ +struct inode *inode =d_inode (dentry); +int error; + + error =setattr_prepare (idmap, dentry, iattr); +if (error) +return error; +
fs/efivarfs/inode.c efivarfs_fileattr_set(struct mnt_idmap *idmap, · line 210
Quoted 10 lines
fs/efivarfs/inode.c +6
-0+setattr_copy (idmap, inode, iattr); +mark_inode_dirty (inode); +return 0 ; +} +static const struct inode_operations efivarfs_file_inode_operations = { .fileattr_get = efivarfs_fileattr_get, .fileattr_set = efivarfs_fileattr_set, + .setattr = efivarfs_setattr, };
Is it sufficient to just ignore inode size changes? Should we complain about this instead?
Re: [PATCH 1/2] efivarfs: prevent setting of zero size on the inodes in the cache
Quoted 46 lines · Ard Biesheuvel
Quoted 44 lines · James Bottomley
Current efivarfs uses
simple_setattrwhich allows the setting of any
size in the inode cache. This is wrong because a zero size file is used to indicate an "uncommitted" variable, so by simple means of truncating the file (as root) any variable may be turned to look like
it's uncommitted. Fix by adding anefivarfs_setattrroutine which does not allow updating of the cached inode size (which now only comes
from the underlying variable).Signed-off-by: James Bottomley
<[email protected]>
---
fs/efivarfs/inode.c | 17 +++++++++++++++++1 file changed, 17 insertions(+)fs/efivarfs/inode.c +16
-0@@ -187,7 +187,24 @@ efivarfs_fileattr_set(struct mnt_idmap *idmap, return 0; } +/* copy of simple_setattr except that it doesn't do i_size updates */ +static int efivarfs_setattr (struct mnt_idmap *idmap,struct dentry *dentry, + struct iattr *iattr) +{ + struct inode *inode = d_inode(dentry); + int error; + + error = setattr_prepare(idmap, dentry, iattr); + if (error) + return error; + + setattr_copy(idmap, inode, iattr); + mark_inode_dirty(inode); + return 0; +} +
Quoted 8 lines
Quoted 6 lines
static const struct
inode_operationsefivarfs_file_inode_operations= {
.fileattr_get =efivarfs_fileattr_get,
.fileattr_set =efivarfs_fileattr_set,
+ .setattr =efivarfs_setattr,
};Is it sufficient to just ignore inode size changes?
Yes, as far as my testing goes.
Quoted 1 line
Should we complain about this instead?
I don't think so because every variable write (at least from the shell) tends to start off with a truncation so we'd get a lot of spurious complaints.
Regards,
James
Ard Biesheuvel
maintainerRe: [PATCH 1/2] efivarfs: prevent setting of zero size on the inodes in the cache
Quoted 57 lines · James Bottomley
Quoted 46 lines · Ard Biesheuvel
Quoted 44 lines · James Bottomley
Current efivarfs uses
simple_setattrwhich allows the setting of any
size in the inode cache. This is wrong because a zero size file is used to indicate an "uncommitted" variable, so by simple means of truncating the file (as root) any variable may be turned to look like
it's uncommitted. Fix by adding anefivarfs_setattrroutine which does not allow updating of the cached inode size (which now only comes
from the underlying variable).Signed-off-by: James Bottomley
<[email protected]>--- fs/efivarfs/inode.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)fs/efivarfs/inode.c +16
-0@@ -187,7 +187,24 @@ efivarfs_fileattr_set(struct mnt_idmap *idmap,return 0 ; } +/* copy of simple_setattr except that it doesn't do i_size updates */ +static int efivarfs_setattr (struct mnt_idmap *idmap,struct dentry *dentry, +struct iattr *iattr) +{ +struct inode *inode =d_inode (dentry); +int error; + + error =setattr_prepare (idmap, dentry, iattr); +if (error) +return error; + +setattr_copy (idmap, inode, iattr); +mark_inode_dirty (inode); +return 0 ; +} +Quoted 8 lines
fs/efivarfs/inode.c efivarfs_fileattr_set(struct mnt_idmap *idmap, · line 210
Quoted 6 lines
fs/efivarfs/inode.c +1
-0static const struct inode_operations efivarfs_file_inode_operations = { .fileattr_get = efivarfs_fileattr_get, .fileattr_set = efivarfs_fileattr_set, + .setattr = efivarfs_setattr, };Is it sufficient to just ignore inode size changes?
Quoted 8 lines
Yes, as far as my testing goes.
Quoted 1 line
Should we complain about this instead?
I don't think so because every variable write (at least from the shell) tends to start off with a truncation so we'd get a lot of spurious complaints.
Fair enough
I'll queue these up - thanks.
PATCH 2/2 selftests/efivarfs: add check for disallowing file truncation
In reply to James BottomleyNow that the ability of arbitrary writes to set the inode size is fixed, verify that a variable file accepts a truncation operation but does not change the stat size because of it.
--- tools/testing/selftests/efivarfs/efivarfs.sh | 23 ++++++++++++++++++++ 1 file changed, 23 insertions(+)
tools/testing/selftests/efivarfs/efivarfs.sh +23 -0
@@ -202,6 +202,28 @@ test_invalid_filenames() exit $ret } +test_no_set_size() +{ + local attrs='\x07\x00\x00\x00' + local file=$efivarfs_mount/$FUNCNAME-$test_guid + local ret=0 + + printf "$attrs\x00" > $file + [ -e $file -a -s $file ] || exit 1 + chattr -i $file + : > $file + if [ $? != 0 ]; then + echo "variable file failed to accept truncation" + ret=1 + elif [ -e $file -a ! -s $file ]; then + echo "file can be truncated to zero size" + ret=1 + fi + rm $file || exit 1 + + exit $ret +} + check_prereqs rc=0
@@ -214,5 +236,6 @@ run_test test_zero_size_delete run_test test_open_unlink run_test test_valid_filenames run_test test_invalid_filenames +run_test test_no_set_size exit $rc
Signature · 1 line
2.35.3