Commit 562b4b63 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/battery-2.6 

* git://git.infradead.org/battery-2.6:
  [PATCH] missing null termination in power supply uevent
parents b7e113dc ed2ba977

drivers/power/power_supply_sysfs.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -289,6 +289,7 @@ int power_supply_uevent(struct device *dev, char **envp, int num_envp, 
		if (ret)

		if (ret)

			goto out;

			goto out;

	}

	}

	envp[i] = NULL;





out:

out:

	free_page((unsigned long)prop_buf);

	free_page((unsigned long)prop_buf);