On Friday, September 1, 2017 1:29:43 AM CEST Kees Cook wrote: > In several places, .data is checked for initialization to gate early > calls to del_timer_sync(). Checking for .function is equally valid, so > switch to this in all callers. > > Cc: "Rafael J. Wysocki" <r...@rjwysocki.net> > Cc: Pavel Machek <pa...@ucw.cz> > Cc: Len Brown <len.br...@intel.com> > Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org> > Cc: Mike Marciniszyn <mike.marcinis...@intel.com> > Cc: Dennis Dalessandro <dennis.dalessan...@intel.com> > Cc: Doug Ledford <dledf...@redhat.com> > Cc: Sean Hefty <sean.he...@intel.com> > Cc: Hal Rosenstock <hal.rosenst...@gmail.com> > Cc: Dmitry Torokhov <dmitry.torok...@gmail.com> > Cc: Jeff Kirsher <jeffrey.t.kirs...@intel.com> > Cc: linux...@vger.kernel.org > Cc: linux-r...@vger.kernel.org > Cc: linux-in...@vger.kernel.org > Cc: intel-wired-...@lists.osuosl.org > Cc: net...@vger.kernel.org > Signed-off-by: Kees Cook <keesc...@chromium.org> > --- > drivers/base/power/wakeup.c | 3 +-- > drivers/infiniband/hw/hfi1/chip.c | 6 ++---- > drivers/infiniband/hw/hfi1/init.c | 2 +- > drivers/infiniband/hw/qib/qib_iba7220.c | 2 +- > drivers/infiniband/hw/qib/qib_iba7322.c | 2 +- > drivers/infiniband/hw/qib/qib_init.c | 14 +++++--------- > drivers/infiniband/hw/qib/qib_mad.c | 2 +- > drivers/input/input.c | 5 ++--- > drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- > 9 files changed, 15 insertions(+), 23 deletions(-) > > diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c > index 144e6d8fafc8..79a3c1b204af 100644 > --- a/drivers/base/power/wakeup.c > +++ b/drivers/base/power/wakeup.c > @@ -479,8 +479,7 @@ static bool wakeup_source_not_registered(struct > wakeup_source *ws) > * Use timer struct to check if the given source is initialized > * by wakeup_source_add. > */ > - return ws->timer.function != pm_wakeup_timer_fn || > - ws->timer.data != (unsigned long)ws; > + return ws->timer.function != pm_wakeup_timer_fn; > } > > /*
Acked-by: Rafael J. Wysocki <rafael.j.wyso...@intel.com> for the above. Thanks!
