On Tue, Sep 11, 2012 at 08:11:12PM +0200, Johannes Berg wrote: > From: Johannes Berg <[email protected]> > > Upstream commit 94543a8d4fb302817014981489f15cb3b92ec3c2. > > iwl_dbgfs_fh_reg_read() can cause crashes and/or > BUG_ON in slub because the ifdefs are wrong, the > code in iwl_dump_fh() should use DEBUGFS, not > DEBUG to protect the buffer writing code. > > Also, while at it, clean up the arguments to the > function, some code and make it generally safer. > > Cc: [email protected] > Reported-by: Benjamin Herrenschmidt <[email protected]> > Signed-off-by: Johannes Berg <[email protected]> > Signed-off-by: John W. Linville <[email protected]> > --- > drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h | 2 +- > drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | 2 +- > drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 30 > +++++++++++---------- > 3 files changed, 18 insertions(+), 16 deletions(-)
Applied, thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
