Skip to content

Commit

Permalink
efi: Make efivarfs entries immutable by default
Browse files Browse the repository at this point in the history
"rm -rf" is bricking some peoples' laptops because of variables being
used to store non-reinitializable firmware driver data that's required
to POST the hardware.

These are 100% bugs, and they need to be fixed, but in the mean time it
shouldn't be easy to *accidentally* brick machines.

We have to have delete working, and picking which variables do and don't
work for deletion is quite intractable, so instead make everything
immutable by default (except for a whitelist), and make tools that
aren't quite so broad-spectrum unset the immutable flag.

Signed-off-by: Peter Jones <pjones@redhat.com>
Tested-by: Lee, Chun-Yi <jlee@suse.com>
Acked-by: Matthew Garrett <mjg59@coreos.com>
Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk>
  • Loading branch information
vathpela authored and mfleming committed Feb 10, 2016
1 parent 8282f5d commit ed8b0de
Show file tree
Hide file tree
Showing 9 changed files with 258 additions and 41 deletions.
7 changes: 7 additions & 0 deletions Documentation/filesystems/efivarfs.txt
Expand Up @@ -14,3 +14,10 @@ filesystem.
efivarfs is typically mounted like this,

mount -t efivarfs none /sys/firmware/efi/efivars

Due to the presence of numerous firmware bugs where removing non-standard
UEFI variables causes the system firmware to fail to POST, efivarfs
files that are not well-known standardized variables are created
as immutable files. This doesn't prevent removal - "chattr -i" will work -
but it does prevent this kind of failure from being accomplished
accidentally.
87 changes: 64 additions & 23 deletions drivers/firmware/efi/vars.c
Expand Up @@ -172,10 +172,12 @@ struct variable_validate {
};

/*
* This is the list of variables we need to validate.
* This is the list of variables we need to validate, as well as the
* whitelist for what we think is safe not to default to immutable.
*
* If it has a validate() method that's not NULL, it'll go into the
* validation routine. If not, it is assumed valid.
* validation routine. If not, it is assumed valid, but still used for
* whitelisting.
*
* Note that it's sorted by {vendor,name}, but globbed names must come after
* any other name with the same prefix.
Expand All @@ -193,11 +195,37 @@ static const struct variable_validate variable_validate[] = {
{ EFI_GLOBAL_VARIABLE_GUID, "ErrOut", validate_device_path },
{ EFI_GLOBAL_VARIABLE_GUID, "ErrOutDev", validate_device_path },
{ EFI_GLOBAL_VARIABLE_GUID, "Lang", validate_ascii_string },
{ EFI_GLOBAL_VARIABLE_GUID, "OsIndications", NULL },
{ EFI_GLOBAL_VARIABLE_GUID, "PlatformLang", validate_ascii_string },
{ EFI_GLOBAL_VARIABLE_GUID, "Timeout", validate_uint16 },
{ NULL_GUID, "", NULL },
};

static bool
variable_matches(const char *var_name, size_t len, const char *match_name,
int *match)
{
for (*match = 0; ; (*match)++) {
char c = match_name[*match];
char u = var_name[*match];

/* Wildcard in the matching name means we've matched */
if (c == '*')
return true;

/* Case sensitive match */
if (!c && *match == len)
return true;

if (c != u)
return false;

if (!c)
return true;
}
return true;
}

bool
efivar_validate(efi_guid_t vendor, efi_char16_t *var_name, u8 *data,
unsigned long data_size)
Expand All @@ -221,35 +249,48 @@ efivar_validate(efi_guid_t vendor, efi_char16_t *var_name, u8 *data,
if (efi_guidcmp(vendor, variable_validate[i].vendor))
continue;

for (match = 0; ; match++) {
char c = name[match];
char u = utf8_name[match];

/* Wildcard in the matching name means we've matched */
if (c == '*') {
kfree(utf8_name);
return variable_validate[i].validate(var_name,
match, data, data_size);
}

/* Case sensitive match */
if (c != u)
if (variable_matches(utf8_name, utf8_size+1, name, &match)) {
if (variable_validate[i].validate == NULL)
break;

/* Reached the end of the string while matching */
if (!c) {
kfree(utf8_name);
return variable_validate[i].validate(var_name,
match, data, data_size);
}
kfree(utf8_name);
return variable_validate[i].validate(var_name, match,
data, data_size);
}
}

kfree(utf8_name);
return true;
}
EXPORT_SYMBOL_GPL(efivar_validate);

bool
efivar_variable_is_removable(efi_guid_t vendor, const char *var_name,
size_t len)
{
int i;
bool found = false;
int match = 0;

/*
* Check if our variable is in the validated variables list
*/
for (i = 0; variable_validate[i].name[0] != '\0'; i++) {
if (efi_guidcmp(variable_validate[i].vendor, vendor))
continue;

if (variable_matches(var_name, len,
variable_validate[i].name, &match)) {
found = true;
break;
}
}

/*
* If it's in our list, it is removable.
*/
return found;
}
EXPORT_SYMBOL_GPL(efivar_variable_is_removable);

static efi_status_t
check_var_size(u32 attributes, unsigned long size)
{
Expand Down
70 changes: 70 additions & 0 deletions fs/efivarfs/file.c
Expand Up @@ -10,6 +10,7 @@
#include <linux/efi.h>
#include <linux/fs.h>
#include <linux/slab.h>
#include <linux/mount.h>

#include "internal.h"

Expand Down Expand Up @@ -103,9 +104,78 @@ static ssize_t efivarfs_file_read(struct file *file, char __user *userbuf,
return size;
}

static int
efivarfs_ioc_getxflags(struct file *file, void __user *arg)
{
struct inode *inode = file->f_mapping->host;
unsigned int i_flags;
unsigned int flags = 0;

i_flags = inode->i_flags;
if (i_flags & S_IMMUTABLE)
flags |= FS_IMMUTABLE_FL;

if (copy_to_user(arg, &flags, sizeof(flags)))
return -EFAULT;
return 0;
}

static int
efivarfs_ioc_setxflags(struct file *file, void __user *arg)
{
struct inode *inode = file->f_mapping->host;
unsigned int flags;
unsigned int i_flags = 0;
int error;

if (!inode_owner_or_capable(inode))
return -EACCES;

if (copy_from_user(&flags, arg, sizeof(flags)))
return -EFAULT;

if (flags & ~FS_IMMUTABLE_FL)
return -EOPNOTSUPP;

if (!capable(CAP_LINUX_IMMUTABLE))
return -EPERM;

if (flags & FS_IMMUTABLE_FL)
i_flags |= S_IMMUTABLE;


error = mnt_want_write_file(file);
if (error)
return error;

inode_lock(inode);
inode_set_flags(inode, i_flags, S_IMMUTABLE);
inode_unlock(inode);

mnt_drop_write_file(file);

return 0;
}

long
efivarfs_file_ioctl(struct file *file, unsigned int cmd, unsigned long p)
{
void __user *arg = (void __user *)p;

switch (cmd) {
case FS_IOC_GETFLAGS:
return efivarfs_ioc_getxflags(file, arg);
case FS_IOC_SETFLAGS:
return efivarfs_ioc_setxflags(file, arg);
}

return -ENOTTY;
}

const struct file_operations efivarfs_file_operations = {
.open = simple_open,
.read = efivarfs_file_read,
.write = efivarfs_file_write,
.llseek = no_llseek,
.unlocked_ioctl = efivarfs_file_ioctl,
};
30 changes: 19 additions & 11 deletions fs/efivarfs/inode.c
Expand Up @@ -15,14 +15,16 @@
#include "internal.h"

struct inode *efivarfs_get_inode(struct super_block *sb,
const struct inode *dir, int mode, dev_t dev)
const struct inode *dir, int mode,
dev_t dev, bool is_removable)
{
struct inode *inode = new_inode(sb);

if (inode) {
inode->i_ino = get_next_ino();
inode->i_mode = mode;
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
inode->i_flags = is_removable ? 0 : S_IMMUTABLE;
switch (mode & S_IFMT) {
case S_IFREG:
inode->i_fop = &efivarfs_file_operations;
Expand Down Expand Up @@ -102,29 +104,34 @@ static void efivarfs_hex_to_guid(const char *str, efi_guid_t *guid)
static int efivarfs_create(struct inode *dir, struct dentry *dentry,
umode_t mode, bool excl)
{
struct inode *inode;
struct inode *inode = NULL;
struct efivar_entry *var;
int namelen, i = 0, err = 0;
bool is_removable = false;

if (!efivarfs_valid_name(dentry->d_name.name, dentry->d_name.len))
return -EINVAL;

inode = efivarfs_get_inode(dir->i_sb, dir, mode, 0);
if (!inode)
return -ENOMEM;

var = kzalloc(sizeof(struct efivar_entry), GFP_KERNEL);
if (!var) {
err = -ENOMEM;
goto out;
}
if (!var)
return -ENOMEM;

/* length of the variable name itself: remove GUID and separator */
namelen = dentry->d_name.len - EFI_VARIABLE_GUID_LEN - 1;

efivarfs_hex_to_guid(dentry->d_name.name + namelen + 1,
&var->var.VendorGuid);

if (efivar_variable_is_removable(var->var.VendorGuid,
dentry->d_name.name, namelen))
is_removable = true;

inode = efivarfs_get_inode(dir->i_sb, dir, mode, 0, is_removable);
if (!inode) {
err = -ENOMEM;
goto out;
}

for (i = 0; i < namelen; i++)
var->var.VariableName[i] = dentry->d_name.name[i];

Expand All @@ -138,7 +145,8 @@ static int efivarfs_create(struct inode *dir, struct dentry *dentry,
out:
if (err) {
kfree(var);
iput(inode);
if (inode)
iput(inode);
}
return err;
}
Expand Down
3 changes: 2 additions & 1 deletion fs/efivarfs/internal.h
Expand Up @@ -15,7 +15,8 @@ extern const struct file_operations efivarfs_file_operations;
extern const struct inode_operations efivarfs_dir_inode_operations;
extern bool efivarfs_valid_name(const char *str, int len);
extern struct inode *efivarfs_get_inode(struct super_block *sb,
const struct inode *dir, int mode, dev_t dev);
const struct inode *dir, int mode, dev_t dev,
bool is_removable);

extern struct list_head efivarfs_list;

Expand Down
9 changes: 7 additions & 2 deletions fs/efivarfs/super.c
Expand Up @@ -120,6 +120,7 @@ static int efivarfs_callback(efi_char16_t *name16, efi_guid_t vendor,
char *name;
int len;
int err = -ENOMEM;
bool is_removable = false;

entry = kzalloc(sizeof(*entry), GFP_KERNEL);
if (!entry)
Expand All @@ -137,13 +138,17 @@ static int efivarfs_callback(efi_char16_t *name16, efi_guid_t vendor,

ucs2_as_utf8(name, entry->var.VariableName, len);

if (efivar_variable_is_removable(entry->var.VendorGuid, name, len))
is_removable = true;

name[len] = '-';

efi_guid_to_str(&entry->var.VendorGuid, name + len + 1);

name[len + EFI_VARIABLE_GUID_LEN+1] = '\0';

inode = efivarfs_get_inode(sb, d_inode(root), S_IFREG | 0644, 0);
inode = efivarfs_get_inode(sb, d_inode(root), S_IFREG | 0644, 0,
is_removable);
if (!inode)
goto fail_name;

Expand Down Expand Up @@ -199,7 +204,7 @@ static int efivarfs_fill_super(struct super_block *sb, void *data, int silent)
sb->s_d_op = &efivarfs_d_ops;
sb->s_time_gran = 1;

inode = efivarfs_get_inode(sb, NULL, S_IFDIR | 0755, 0);
inode = efivarfs_get_inode(sb, NULL, S_IFDIR | 0755, 0, true);
if (!inode)
return -ENOMEM;
inode->i_op = &efivarfs_dir_inode_operations;
Expand Down
2 changes: 2 additions & 0 deletions include/linux/efi.h
Expand Up @@ -1201,6 +1201,8 @@ struct efivar_entry *efivar_entry_find(efi_char16_t *name, efi_guid_t guid,

bool efivar_validate(efi_guid_t vendor, efi_char16_t *var_name, u8 *data,
unsigned long data_size);
bool efivar_variable_is_removable(efi_guid_t vendor, const char *name,
size_t len);

extern struct work_struct efivar_work;
void efivar_run_worker(void);
Expand Down
19 changes: 16 additions & 3 deletions tools/testing/selftests/efivarfs/efivarfs.sh
Expand Up @@ -88,7 +88,11 @@ test_delete()
exit 1
fi

rm $file
rm $file 2>/dev/null
if [ $? -ne 0 ]; then
chattr -i $file
rm $file
fi

if [ -e $file ]; then
echo "$file couldn't be deleted" >&2
Expand All @@ -111,6 +115,7 @@ test_zero_size_delete()
exit 1
fi

chattr -i $file
printf "$attrs" > $file

if [ -e $file ]; then
Expand Down Expand Up @@ -141,7 +146,11 @@ test_valid_filenames()
echo "$file could not be created" >&2
ret=1
else
rm $file
rm $file 2>/dev/null
if [ $? -ne 0 ]; then
chattr -i $file
rm $file
fi
fi
done

Expand Down Expand Up @@ -174,7 +183,11 @@ test_invalid_filenames()

if [ -e $file ]; then
echo "Creating $file should have failed" >&2
rm $file
rm $file 2>/dev/null
if [ $? -ne 0 ]; then
chattr -i $file
rm $file
fi
ret=1
fi
done
Expand Down

0 comments on commit ed8b0de

Please sign in to comment.