| Message ID | 1495714243-5595-1-git-send-email-prarit@redhat.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
Prarit Bhargava <prarit@redhat.com> writes: > I somehow managed to trim off the cc list ... oops. Sorry about that. > > P. > > ----8<---- > > nfit_init() calls nfit_mce_register() on module load. When the module > load fails the nfit mce decoder is not unregistered. The module's > memory is freed leaving the decoder chain referencing junk. This will > cause panics as future registrations will reference the free'd memory. > > Unregister the nfit mce decoder on module init failure. > > [v2]: register and then unregister mce handler to avoid losing mce events > > Signed-off-by: Prarit Bhargava <prarit@redhat.com> Looks good to me. Acked-by: Jeff Moyer <jmoyer@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 05/25, Prarit Bhargava wrote: > I somehow managed to trim off the cc list ... oops. Sorry about that. > > P. > > ----8<---- > > nfit_init() calls nfit_mce_register() on module load. When the module > load fails the nfit mce decoder is not unregistered. The module's > memory is freed leaving the decoder chain referencing junk. This will > cause panics as future registrations will reference the free'd memory. > > Unregister the nfit mce decoder on module init failure. > > [v2]: register and then unregister mce handler to avoid losing mce events > > Signed-off-by: Prarit Bhargava <prarit@redhat.com> > Cc: Jeff Moyer <jmoyer@redhat.com> > Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> > Cc: Len Brown <lenb@kernel.org> > Cc: Dan Williams <dan.j.williams@intel.com> > Cc: Vishal Verma <vishal.l.verma@intel.com> > Cc: "Lee, Chun-Yi" <joeyli.kernel@gmail.com> > Cc: Linda Knippers <linda.knippers@hpe.com> > --- > drivers/acpi/nfit/core.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > Looks good, Reviewed-by: Vishal Verma <vishal.l.verma@intel.com> > diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c > index 656acb5d7166..450e4a233b5e 100644 > --- a/drivers/acpi/nfit/core.c > +++ b/drivers/acpi/nfit/core.c > @@ -3043,6 +3043,8 @@ static void acpi_nfit_notify(struct acpi_device *adev, u32 event) > > static __init int nfit_init(void) > { > + int ret; > + > BUILD_BUG_ON(sizeof(struct acpi_table_nfit) != 40); > BUILD_BUG_ON(sizeof(struct acpi_nfit_system_address) != 56); > BUILD_BUG_ON(sizeof(struct acpi_nfit_memory_map) != 48); > @@ -3070,8 +3072,12 @@ static __init int nfit_init(void) > return -ENOMEM; > > nfit_mce_register(); > + ret = acpi_bus_register_driver(&acpi_nfit_driver); > + if (ret) > + nfit_mce_unregister(); > + > + return ret; > > - return acpi_bus_register_driver(&acpi_nfit_driver); > } > > static __exit void nfit_exit(void) > -- > 1.7.9.3 > -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c index 656acb5d7166..450e4a233b5e 100644 --- a/drivers/acpi/nfit/core.c +++ b/drivers/acpi/nfit/core.c @@ -3043,6 +3043,8 @@ static void acpi_nfit_notify(struct acpi_device *adev, u32 event) static __init int nfit_init(void) { + int ret; + BUILD_BUG_ON(sizeof(struct acpi_table_nfit) != 40); BUILD_BUG_ON(sizeof(struct acpi_nfit_system_address) != 56); BUILD_BUG_ON(sizeof(struct acpi_nfit_memory_map) != 48); @@ -3070,8 +3072,12 @@ static __init int nfit_init(void) return -ENOMEM; nfit_mce_register(); + ret = acpi_bus_register_driver(&acpi_nfit_driver); + if (ret) + nfit_mce_unregister(); + + return ret; - return acpi_bus_register_driver(&acpi_nfit_driver); } static __exit void nfit_exit(void)
I somehow managed to trim off the cc list ... oops. Sorry about that. P. ----8<---- nfit_init() calls nfit_mce_register() on module load. When the module load fails the nfit mce decoder is not unregistered. The module's memory is freed leaving the decoder chain referencing junk. This will cause panics as future registrations will reference the free'd memory. Unregister the nfit mce decoder on module init failure. [v2]: register and then unregister mce handler to avoid losing mce events Signed-off-by: Prarit Bhargava <prarit@redhat.com> Cc: Jeff Moyer <jmoyer@redhat.com> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> Cc: Len Brown <lenb@kernel.org> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Vishal Verma <vishal.l.verma@intel.com> Cc: "Lee, Chun-Yi" <joeyli.kernel@gmail.com> Cc: Linda Knippers <linda.knippers@hpe.com> --- drivers/acpi/nfit/core.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)