mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
pstore updates for v6.8-rc1
- Do not allow misconfigured ECC sizes (Sergey Shtylyov) - Allow for odd number of CPUs (Weichen Chen) - Refactor error handling to use cleanup.h -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEEpcP2jyKd1g9yPm4TiXL039xtwCYFAmWcPVEWHGtlZXNjb29r QGNocm9taXVtLm9yZwAKCRCJcvTf3G3AJgjoD/wIWCiu4TWAziFlXy4Gmz2bFT+i bY7APft9SkCa9QENIohhKaNuDYSymjGfq+cupvZ3/erDdfjgwPAg/Cs8fiKnAdRY +sSFyDttcZu0Z9u7QB1TI2GG4E0MA/x9K001RwNzODj27yCj4mozuwoyfiuiTgHo Dclkl2p7b4SjXrWuh5tCSaaV3TO3af8rAseT63phoqBM0BwRwh7rza1A3LhDoeWY 27/uba919KwTfvBH+yqOtglsWIe9bBI+vr4J9OGb2DOdpWi3yhwe074mjCn5C/BR TpQDUT5moX0xsmdc4NaTKgyxWQ5EOa832TjNbPn5RMqaslVvnz6zYLCL+D1qYQvG Jasbg8qa8hqdxS+KxgPZTSfkmpYi80AxzBGngRrlXEMArLTW40dhmebXN5QiT0CP IKMYq7xuPiVN+GiZTl7hThqxFTOb5I6pbKDoIUFPCTIjJUcLTwM9y71dQ+XzJHKu GAHvzvzLSD2Y0BwaWedWinPjTqaBsOfeqecE77dIkMoFWa7Y0dx0BxySUT2dUKny 6Z28mMX6C9sf5ncdJLjcEXf0UDECfnuXw+1NJUwyaSBtlR56pWIk33YFWf1+u3Jn p6ZX6Jx6A77h4236A63zodSdna4NzuSQETmyqFvJOra8Gubidx2ggwL9EdxK4qHq tQJxHbxI4+vRpaOm7A== =TOWy -----END PGP SIGNATURE----- Merge tag 'pstore-v6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux Pull pstore updates from Kees Cook: - Do not allow misconfigured ECC sizes (Sergey Shtylyov) - Allow for odd number of CPUs (Weichen Chen) - Refactor error handling to use cleanup.h * tag 'pstore-v6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: pstore: inode: Use cleanup.h for struct pstore_private pstore: inode: Use __free(pstore_iput) for inode allocations pstore: inode: Convert mutex usage to guard(mutex) pstore: inode: Convert kfree() usage to __free(kfree) pstore: ram_core: fix possible overflow in persistent_ram_init_ecc() pstore/ram: Fix crash when setting number of cpus to an odd number
This commit is contained in:
commit
72116efd63
3 changed files with 45 additions and 65 deletions
|
@ -23,6 +23,7 @@
|
|||
#include <linux/pstore.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/uaccess.h>
|
||||
#include <linux/cleanup.h>
|
||||
|
||||
#include "internal.h"
|
||||
|
||||
|
@ -34,6 +35,8 @@ static LIST_HEAD(records_list);
|
|||
static DEFINE_MUTEX(pstore_sb_lock);
|
||||
static struct super_block *pstore_sb;
|
||||
|
||||
DEFINE_FREE(pstore_iput, struct inode *, if (_T) iput(_T))
|
||||
|
||||
struct pstore_private {
|
||||
struct list_head list;
|
||||
struct dentry *dentry;
|
||||
|
@ -60,11 +63,12 @@ static void free_pstore_private(struct pstore_private *private)
|
|||
}
|
||||
kfree(private);
|
||||
}
|
||||
DEFINE_FREE(pstore_private, struct pstore_private *, free_pstore_private(_T));
|
||||
|
||||
static void *pstore_ftrace_seq_start(struct seq_file *s, loff_t *pos)
|
||||
{
|
||||
struct pstore_private *ps = s->private;
|
||||
struct pstore_ftrace_seq_data *data;
|
||||
struct pstore_ftrace_seq_data *data __free(kfree) = NULL;
|
||||
|
||||
data = kzalloc(sizeof(*data), GFP_KERNEL);
|
||||
if (!data)
|
||||
|
@ -72,13 +76,10 @@ static void *pstore_ftrace_seq_start(struct seq_file *s, loff_t *pos)
|
|||
|
||||
data->off = ps->total_size % REC_SIZE;
|
||||
data->off += *pos * REC_SIZE;
|
||||
if (data->off + REC_SIZE > ps->total_size) {
|
||||
kfree(data);
|
||||
if (data->off + REC_SIZE > ps->total_size)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return data;
|
||||
|
||||
return_ptr(data);
|
||||
}
|
||||
|
||||
static void pstore_ftrace_seq_stop(struct seq_file *s, void *v)
|
||||
|
@ -182,25 +183,21 @@ static int pstore_unlink(struct inode *dir, struct dentry *dentry)
|
|||
{
|
||||
struct pstore_private *p = d_inode(dentry)->i_private;
|
||||
struct pstore_record *record = p->record;
|
||||
int rc = 0;
|
||||
|
||||
if (!record->psi->erase)
|
||||
return -EPERM;
|
||||
|
||||
/* Make sure we can't race while removing this file. */
|
||||
mutex_lock(&records_list_lock);
|
||||
if (!list_empty(&p->list))
|
||||
list_del_init(&p->list);
|
||||
else
|
||||
rc = -ENOENT;
|
||||
p->dentry = NULL;
|
||||
mutex_unlock(&records_list_lock);
|
||||
if (rc)
|
||||
return rc;
|
||||
scoped_guard(mutex, &records_list_lock) {
|
||||
if (!list_empty(&p->list))
|
||||
list_del_init(&p->list);
|
||||
else
|
||||
return -ENOENT;
|
||||
p->dentry = NULL;
|
||||
}
|
||||
|
||||
mutex_lock(&record->psi->read_mutex);
|
||||
record->psi->erase(record);
|
||||
mutex_unlock(&record->psi->read_mutex);
|
||||
scoped_guard(mutex, &record->psi->read_mutex)
|
||||
record->psi->erase(record);
|
||||
|
||||
return simple_unlink(dir, dentry);
|
||||
}
|
||||
|
@ -292,19 +289,16 @@ static struct dentry *psinfo_lock_root(void)
|
|||
{
|
||||
struct dentry *root;
|
||||
|
||||
mutex_lock(&pstore_sb_lock);
|
||||
guard(mutex)(&pstore_sb_lock);
|
||||
/*
|
||||
* Having no backend is fine -- no records appear.
|
||||
* Not being mounted is fine -- nothing to do.
|
||||
*/
|
||||
if (!psinfo || !pstore_sb) {
|
||||
mutex_unlock(&pstore_sb_lock);
|
||||
if (!psinfo || !pstore_sb)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
root = pstore_sb->s_root;
|
||||
inode_lock(d_inode(root));
|
||||
mutex_unlock(&pstore_sb_lock);
|
||||
|
||||
return root;
|
||||
}
|
||||
|
@ -319,19 +313,19 @@ int pstore_put_backend_records(struct pstore_info *psi)
|
|||
if (!root)
|
||||
return 0;
|
||||
|
||||
mutex_lock(&records_list_lock);
|
||||
list_for_each_entry_safe(pos, tmp, &records_list, list) {
|
||||
if (pos->record->psi == psi) {
|
||||
list_del_init(&pos->list);
|
||||
rc = simple_unlink(d_inode(root), pos->dentry);
|
||||
if (WARN_ON(rc))
|
||||
break;
|
||||
d_drop(pos->dentry);
|
||||
dput(pos->dentry);
|
||||
pos->dentry = NULL;
|
||||
scoped_guard(mutex, &records_list_lock) {
|
||||
list_for_each_entry_safe(pos, tmp, &records_list, list) {
|
||||
if (pos->record->psi == psi) {
|
||||
list_del_init(&pos->list);
|
||||
rc = simple_unlink(d_inode(root), pos->dentry);
|
||||
if (WARN_ON(rc))
|
||||
break;
|
||||
d_drop(pos->dentry);
|
||||
dput(pos->dentry);
|
||||
pos->dentry = NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
mutex_unlock(&records_list_lock);
|
||||
|
||||
inode_unlock(d_inode(root));
|
||||
|
||||
|
@ -346,29 +340,27 @@ int pstore_put_backend_records(struct pstore_info *psi)
|
|||
int pstore_mkfile(struct dentry *root, struct pstore_record *record)
|
||||
{
|
||||
struct dentry *dentry;
|
||||
struct inode *inode;
|
||||
int rc = 0;
|
||||
struct inode *inode __free(pstore_iput) = NULL;
|
||||
char name[PSTORE_NAMELEN];
|
||||
struct pstore_private *private, *pos;
|
||||
struct pstore_private *private __free(pstore_private) = NULL, *pos;
|
||||
size_t size = record->size + record->ecc_notice_size;
|
||||
|
||||
if (WARN_ON(!inode_is_locked(d_inode(root))))
|
||||
return -EINVAL;
|
||||
|
||||
rc = -EEXIST;
|
||||
guard(mutex)(&records_list_lock);
|
||||
|
||||
/* Skip records that are already present in the filesystem. */
|
||||
mutex_lock(&records_list_lock);
|
||||
list_for_each_entry(pos, &records_list, list) {
|
||||
if (pos->record->type == record->type &&
|
||||
pos->record->id == record->id &&
|
||||
pos->record->psi == record->psi)
|
||||
goto fail;
|
||||
return -EEXIST;
|
||||
}
|
||||
|
||||
rc = -ENOMEM;
|
||||
inode = pstore_get_inode(root->d_sb);
|
||||
if (!inode)
|
||||
goto fail;
|
||||
return -ENOMEM;
|
||||
inode->i_mode = S_IFREG | 0444;
|
||||
inode->i_fop = &pstore_file_operations;
|
||||
scnprintf(name, sizeof(name), "%s-%s-%llu%s",
|
||||
|
@ -378,11 +370,11 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record)
|
|||
|
||||
private = kzalloc(sizeof(*private), GFP_KERNEL);
|
||||
if (!private)
|
||||
goto fail_inode;
|
||||
return -ENOMEM;
|
||||
|
||||
dentry = d_alloc_name(root, name);
|
||||
if (!dentry)
|
||||
goto fail_private;
|
||||
return -ENOMEM;
|
||||
|
||||
private->dentry = dentry;
|
||||
private->record = record;
|
||||
|
@ -393,20 +385,11 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record)
|
|||
inode_set_mtime_to_ts(inode,
|
||||
inode_set_ctime_to_ts(inode, record->time));
|
||||
|
||||
d_add(dentry, inode);
|
||||
d_add(dentry, no_free_ptr(inode));
|
||||
|
||||
list_add(&private->list, &records_list);
|
||||
mutex_unlock(&records_list_lock);
|
||||
list_add(&(no_free_ptr(private))->list, &records_list);
|
||||
|
||||
return 0;
|
||||
|
||||
fail_private:
|
||||
free_pstore_private(private);
|
||||
fail_inode:
|
||||
iput(inode);
|
||||
fail:
|
||||
mutex_unlock(&records_list_lock);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -451,9 +434,8 @@ static int pstore_fill_super(struct super_block *sb, void *data, int silent)
|
|||
if (!sb->s_root)
|
||||
return -ENOMEM;
|
||||
|
||||
mutex_lock(&pstore_sb_lock);
|
||||
pstore_sb = sb;
|
||||
mutex_unlock(&pstore_sb_lock);
|
||||
scoped_guard(mutex, &pstore_sb_lock)
|
||||
pstore_sb = sb;
|
||||
|
||||
pstore_get_records(0);
|
||||
|
||||
|
@ -468,17 +450,14 @@ static struct dentry *pstore_mount(struct file_system_type *fs_type,
|
|||
|
||||
static void pstore_kill_sb(struct super_block *sb)
|
||||
{
|
||||
mutex_lock(&pstore_sb_lock);
|
||||
guard(mutex)(&pstore_sb_lock);
|
||||
WARN_ON(pstore_sb && pstore_sb != sb);
|
||||
|
||||
kill_litter_super(sb);
|
||||
pstore_sb = NULL;
|
||||
|
||||
mutex_lock(&records_list_lock);
|
||||
guard(mutex)(&records_list_lock);
|
||||
INIT_LIST_HEAD(&records_list);
|
||||
mutex_unlock(&records_list_lock);
|
||||
|
||||
mutex_unlock(&pstore_sb_lock);
|
||||
}
|
||||
|
||||
static struct file_system_type pstore_fs_type = {
|
||||
|
|
|
@ -529,6 +529,7 @@ static int ramoops_init_przs(const char *name,
|
|||
}
|
||||
|
||||
zone_sz = mem_sz / *cnt;
|
||||
zone_sz = ALIGN_DOWN(zone_sz, 2);
|
||||
if (!zone_sz) {
|
||||
dev_err(dev, "%s zone size == 0\n", name);
|
||||
goto fail;
|
||||
|
|
|
@ -190,7 +190,7 @@ static int persistent_ram_init_ecc(struct persistent_ram_zone *prz,
|
|||
{
|
||||
int numerr;
|
||||
struct persistent_ram_buffer *buffer = prz->buffer;
|
||||
int ecc_blocks;
|
||||
size_t ecc_blocks;
|
||||
size_t ecc_total;
|
||||
|
||||
if (!ecc_info || !ecc_info->ecc_size)
|
||||
|
|
Loading…
Reference in a new issue