Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 757be186 authored by Neil Horman's avatar Neil Horman Committed by Linus Torvalds
Browse files

[PATCH] sh: fix proc file removal for superh store queue module 



Clean up proc file removal in sq module for superh arch.  currently on a
failed module load or on module unload a proc file is left registered which
can cause a random memory execution or oopses if read after unload.  This
patch cleans up that deregistration.

Signed-off-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
Cc: Kazumoto Kojima <kkojima@rr.iij4u.or.jp>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 453c3e47

arch/sh/kernel/cpu/sh4/sq.c

+7 −3
Original line number Diff line number Diff line
@@ -421,18 +421,22 @@ static struct miscdevice sq_dev = { 


static int __init sq_api_init(void)

{

	int ret;

	printk(KERN_NOTICE "sq: Registering store queue API.\n");



#ifdef CONFIG_PROC_FS

	create_proc_read_entry("sq_mapping", 0, 0, sq_mapping_read_proc, 0);

#endif



	return misc_register(&sq_dev);

	ret = misc_register(&sq_dev);

	if (ret)

		remove_proc_entry("sq_mapping", NULL);



	return ret;

}



static void __exit sq_api_exit(void)

{

	misc_deregister(&sq_dev);

	remove_proc_entry("sq_mapping", NULL);

}



module_init(sq_api_init);