core kernel fix
Linus,
Please pull the latest core-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core-fixes-for-linus
Thanks,
Ingo
------------------>
Kyle McMartin (1):
dma-debug: Fix check_unmap null pointer dereference
lib/dma-debug.c | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-)
lib/dma-debug.c +16 -12
@@ -156,9 +156,13 @@ static bool driver_filter(struct device *dev)return true;/* driver filter on and initialized */ -if (current_driver && dev->driver == current_driver) +if (current_driver && dev && dev->driver == current_driver)return true; +/* driver filter on, but we can't filter on a NULL device... */ +if (!dev) +return false; +if (current_driver || !current_driver_name[0 ])return false;
@@ -183,17 +187,17 @@ static bool driver_filter(struct device *dev)return ret; } -#define err_printk(dev, entry, format, arg...) do { \ - error_count += 1; \ - if (driver_filter(dev) && \ - (show_all_errors || show_num_errors > 0)) { \ - WARN(1, "%s %s: " format, \ - dev_driver_string(dev), \ - dev_name(dev) , ## arg); \ - dump_entry_trace(entry); \ - } \ - if (!show_all_errors && show_num_errors > 0) \ - show_num_errors -= 1; \ +#define err_printk(dev, entry, format, arg...) do { \ + error_count += 1; \ + if (driver_filter(dev) && \ + (show_all_errors || show_num_errors > 0)) { \ + WARN(1, "%s %s: " format, \ + dev ? dev_driver_string(dev) : "NULL", \ + dev ? dev_name(dev) : "NULL", ## arg); \ + dump_entry_trace(entry); \ + } \ + if (!show_all_errors && show_num_errors > 0) \ + show_num_errors -= 1; \ } while (0);/*