Commit 471b095d authored Sep 18, 2014 by Kees Cook Committed by Greg Kroah-Hartman Sep 23, 2014

firmware_class: make sure fw requests contain a name



An empty firmware request name will trigger warnings when building
device names. Make sure this is caught earlier and rejected.

The warning was visible via the test_firmware.ko module interface:

echo -ne "\x00" > /sys/devices/virtual/misc/test_firmware/trigger_request

Reported-by: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: stable@vger.kernel.org
Tested-by: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 41575335

drivers/base/firmware_class.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1105,6 +1105,9 @@ _request_firmware(const struct firmware *firmware_p, const char name,
	if (!firmware_p)		if (!firmware_p)
	return -EINVAL;		return -EINVAL;

			if (!name \|\| name[0] == '\0')
			return -EINVAL;

	ret = _request_firmware_prepare(&fw, name, device);		ret = _request_firmware_prepare(&fw, name, device);
	if (ret <= 0) /* error or already assigned */		if (ret <= 0) /* error or already assigned */
	goto out;		goto out;