Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87bcfa33 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-fixes-for-linus' of... 

Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  dma-debug: Fix check_unmap null pointer dereference
parents 44afa9a4 ec9c96ef

lib/dma-debug.c

+16 −12
Original line number Diff line number Diff line
@@ -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;
@@ -188,8 +192,8 @@ static bool driver_filter(struct device *dev) 
		if (driver_filter(dev) &&				\

		    (show_all_errors || show_num_errors > 0)) {		\

			WARN(1, "%s %s: " format,			\

			     dev_driver_string(dev),		\

			     dev_name(dev) , ## arg);		\

			     dev ? dev_driver_string(dev) : "NULL",	\

			     dev ? dev_name(dev) : "NULL", ## arg);	\

			dump_entry_trace(entry);			\

		}							\

		if (!show_all_errors && show_num_errors > 0)		\