Commit 52a2b11c authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Len Brown
Browse files

ACPI: clean up video.c boundary checks and types 



proc.c and video.c are a bit sloppy around types and style,
confusing gcc for a new feature that'll be in 2.6.33 and will
cause a warning on the current code.

This patch changes

if  (foo + 1 > sizeof bar)

into

if (foo >= sizeof(bar))

which is more kernel-style.

it also changes a variable in proc.c to unsigned; it gets assigned
a value from an unsigned type, and is then only compared for > not
for negative, so using unsigned is just outright the right type

Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 012abeea

drivers/acpi/proc.c

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ acpi_system_write_wakeup_device(struct file *file, 
	struct list_head *node, *next;

	char strbuf[5];

	char str[5] = "";

	int len = count;

	unsigned int len = count;

	struct acpi_device *found_dev = NULL;



	if (len > 4)

drivers/acpi/video.c

+4 −4
Original line number Diff line number Diff line
@@ -1223,7 +1223,7 @@ acpi_video_device_write_state(struct file *file, 
	u32 state = 0;





	if (!dev || count + 1 > sizeof str)

	if (!dev || count >= sizeof(str))

		return -EINVAL;



	if (copy_from_user(str, buffer, count))
@@ -1280,7 +1280,7 @@ acpi_video_device_write_brightness(struct file *file, 
	int i;





	if (!dev || !dev->brightness || count + 1 > sizeof str)

	if (!dev || !dev->brightness || count >= sizeof(str))

		return -EINVAL;



	if (copy_from_user(str, buffer, count))
@@ -1562,7 +1562,7 @@ acpi_video_bus_write_POST(struct file *file, 
	unsigned long long opt, options;





	if (!video || count + 1 > sizeof str)

	if (!video || count >= sizeof(str))

		return -EINVAL;



	status = acpi_video_bus_POST_options(video, &options);
@@ -1602,7 +1602,7 @@ acpi_video_bus_write_DOS(struct file *file, 
	unsigned long opt;





	if (!video || count + 1 > sizeof str)

	if (!video || count >= sizeof(str))

		return -EINVAL;



	if (copy_from_user(str, buffer, count))

CRA Git | Maintained and supported by SUSTech CRA and CCSE