[PATCH 2/2] staging: fsl-mc: Avoid section mismatch

From	Thierry Reding <thierry.reding@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH 2/2] staging: fsl-mc: Avoid section mismatch
Date	2016-02-15 14:30 +0100
Message-ID	<r2rnX-1yI-5@gated-at.bofh.it> (permalink)
References	<r2rnX-1yI-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Thierry Reding <treding@nvidia.com>

The fsl_mc_allocator_driver_exit() function is marked __exit, but is
called by the error handling code in fsl_mc_allocator_driver_init().
This results in a section mismatch, which in turn could lead to
executing random code.

Remove the __exit annotation to fix this.

Cc: J. German Rivera <German.Rivera@freescale.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/staging/fsl-mc/bus/mc-allocator.c   | 2 +-
 drivers/staging/fsl-mc/include/mc-private.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/fsl-mc/bus/mc-allocator.c b/drivers/staging/fsl-mc/bus/mc-allocator.c
index c5fa628411ec..86f8543c2b9a 100644
--- a/drivers/staging/fsl-mc/bus/mc-allocator.c
+++ b/drivers/staging/fsl-mc/bus/mc-allocator.c
@@ -756,7 +756,7 @@ int __init fsl_mc_allocator_driver_init(void)
 	return fsl_mc_driver_register(&fsl_mc_allocator_driver);
 }
 
-void __exit fsl_mc_allocator_driver_exit(void)
+void fsl_mc_allocator_driver_exit(void)
 {
 	fsl_mc_driver_unregister(&fsl_mc_allocator_driver);
 }
diff --git a/drivers/staging/fsl-mc/include/mc-private.h b/drivers/staging/fsl-mc/include/mc-private.h
index be72a44ba064..ee5f1d2bf604 100644
--- a/drivers/staging/fsl-mc/include/mc-private.h
+++ b/drivers/staging/fsl-mc/include/mc-private.h
@@ -123,7 +123,7 @@ void dprc_driver_exit(void);
 
 int __init fsl_mc_allocator_driver_init(void);
 
-void __exit fsl_mc_allocator_driver_exit(void);
+void fsl_mc_allocator_driver_exit(void);
 
 int __must_check fsl_mc_resource_allocate(struct fsl_mc_bus *mc_bus,
 					  enum fsl_mc_pool_type pool_type,
-- 
2.7.1

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 2/2] staging: fsl-mc: Avoid section mismatch Thierry Reding <thierry.reding@gmail.com> - 2016-02-15 14:30 +0100

csiph-web