|
@@ -100,24 +100,30 @@ static const struct file_operations empty_fops;
|
|
static int create_xattr(struct ubifs_info *c, struct inode *host,
|
|
static int create_xattr(struct ubifs_info *c, struct inode *host,
|
|
const struct qstr *nm, const void *value, int size)
|
|
const struct qstr *nm, const void *value, int size)
|
|
{
|
|
{
|
|
- int err;
|
|
|
|
|
|
+ int err, names_len;
|
|
struct inode *inode;
|
|
struct inode *inode;
|
|
struct ubifs_inode *ui, *host_ui = ubifs_inode(host);
|
|
struct ubifs_inode *ui, *host_ui = ubifs_inode(host);
|
|
struct ubifs_budget_req req = { .new_ino = 1, .new_dent = 1,
|
|
struct ubifs_budget_req req = { .new_ino = 1, .new_dent = 1,
|
|
.new_ino_d = ALIGN(size, 8), .dirtied_ino = 1,
|
|
.new_ino_d = ALIGN(size, 8), .dirtied_ino = 1,
|
|
.dirtied_ino_d = ALIGN(host_ui->data_len, 8) };
|
|
.dirtied_ino_d = ALIGN(host_ui->data_len, 8) };
|
|
|
|
|
|
- if (host_ui->xattr_cnt >= MAX_XATTRS_PER_INODE)
|
|
|
|
|
|
+ if (host_ui->xattr_cnt >= MAX_XATTRS_PER_INODE) {
|
|
|
|
+ ubifs_err("inode %lu already has too many xattrs (%d), cannot create more",
|
|
|
|
+ host->i_ino, host_ui->xattr_cnt);
|
|
return -ENOSPC;
|
|
return -ENOSPC;
|
|
|
|
+ }
|
|
/*
|
|
/*
|
|
* Linux limits the maximum size of the extended attribute names list
|
|
* Linux limits the maximum size of the extended attribute names list
|
|
* to %XATTR_LIST_MAX. This means we should not allow creating more
|
|
* to %XATTR_LIST_MAX. This means we should not allow creating more
|
|
* extended attributes if the name list becomes larger. This limitation
|
|
* extended attributes if the name list becomes larger. This limitation
|
|
* is artificial for UBIFS, though.
|
|
* is artificial for UBIFS, though.
|
|
*/
|
|
*/
|
|
- if (host_ui->xattr_names + host_ui->xattr_cnt +
|
|
|
|
- nm->len + 1 > XATTR_LIST_MAX)
|
|
|
|
|
|
+ names_len = host_ui->xattr_names + host_ui->xattr_cnt + nm->len + 1;
|
|
|
|
+ if (names_len > XATTR_LIST_MAX) {
|
|
|
|
+ ubifs_err("cannot add one more xattr name to inode %lu, total names length would become %d, max. is %d",
|
|
|
|
+ host->i_ino, names_len, XATTR_LIST_MAX);
|
|
return -ENOSPC;
|
|
return -ENOSPC;
|
|
|
|
+ }
|
|
|
|
|
|
err = ubifs_budget_space(c, &req);
|
|
err = ubifs_budget_space(c, &req);
|
|
if (err)
|
|
if (err)
|
|
@@ -651,5 +657,8 @@ int ubifs_init_security(struct inode *dentry, struct inode *inode,
|
|
&init_xattrs, 0);
|
|
&init_xattrs, 0);
|
|
mutex_unlock(&inode->i_mutex);
|
|
mutex_unlock(&inode->i_mutex);
|
|
|
|
|
|
|
|
+ if (err)
|
|
|
|
+ ubifs_err("cannot initialize security for inode %lu, error %d",
|
|
|
|
+ inode->i_ino, err);
|
|
return err;
|
|
return err;
|
|
}
|
|
}
|