lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[POWERPC] scanlog_init cleanup and minor fixes

Browse Source 
scanlog_init() could use some love.

* properly return -ENODEV if this system doesn't support scan-log-dump
* don't printk if scan-log-dump not present; only older systems have it
* convert from create_proc_entry() to preferred proc_create()
* allocate zeroed data buffer
* fix potential memory leak of ent->data on failed create_proc_entry()
* simplify control flow

Signed-off-by: Nathan Lynch <ntl@pobox.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Nathan Lynch
2008-03-24 09:51:45 +11:00
committed by Paul Mackerras
parent 9356d90eff
commit f61fb8a52c
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
arch/powerpc/platforms/pseries/scanlog.c
View File

@@ -195,31 +195,30 @@ const struct file_operations scanlog_fops = {
static int __init scanlog_init(void) static int __init scanlog_init(void)
{ {
struct proc_dir_entry *ent; struct proc_dir_entry *ent;
void *data;
int err = -ENOMEM;
ibm_scan_log_dump = rtas_token("ibm,scan-log-dump"); ibm_scan_log_dump = rtas_token("ibm,scan-log-dump");
if (ibm_scan_log_dump == RTAS_UNKNOWN_SERVICE) { if (ibm_scan_log_dump == RTAS_UNKNOWN_SERVICE)
printk(KERN_ERR "scan-log-dump not implemented on this system\n"); return -ENODEV;
return -EIO;
}
ent = create_proc_entry("ppc64/rtas/scan-log-dump", S_IRUSR, NULL); /* Ideally we could allocate a buffer < 4G */
if (ent) { data = kzalloc(RTAS_DATA_BUF_SIZE, GFP_KERNEL);
ent->proc_fops = &scanlog_fops; if (!data)
/* Ideally we could allocate a buffer < 4G */ goto err;
ent->data = kmalloc(RTAS_DATA_BUF_SIZE, GFP_KERNEL);
if (!ent->data) { ent = proc_create("ppc64/rtas/scan-log-dump", S_IRUSR, NULL,
printk(KERN_ERR "Failed to allocate a buffer\n"); &scanlog_fops);
remove_proc_entry("scan-log-dump", ent->parent); if (!ent)
return -ENOMEM; goto err;
}
((unsigned int *)ent->data)[0] = 0; ent->data = data;
} else {
printk(KERN_ERR "Failed to create ppc64/scan-log-dump proc entry\n");
return -EIO;
}
proc_ppc64_scan_log_dump = ent; proc_ppc64_scan_log_dump = ent;
return 0; return 0;
err:
kfree(data);
return err;
} }
static void __exit scanlog_cleanup(void) static void __exit scanlog_cleanup(void)