Fix generic fb_ddc i2c edid probe msg (4be70390) · Commits · 戴 / test

Benh points out that the msgs[0].flags entry never got initialized, and since it's an automatic stack allocation, it could have any random value, which is bad. Rewrite the initializer to explicitly initialize all fields of the small i2c_msg structure array we generate. Just to keep it all obvious, let's handle msgs[1].buf in the same initializer while we're at it, instead of initializing that one separately later. Signed-off-by:

Linus Torvalds <torvalds@osdl.org>

drivers/video/fb_ddc.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -20,26 +20,26 @@
		static unsigned char fb_do_probe_ddc_edid(struct i2c_adapter adapter)
		{
		unsigned char start = 0x0;
		unsigned char *buf = kmalloc(EDID_LENGTH, GFP_KERNEL);
		struct i2c_msg msgs[] = {
		{
		.addr = DDC_ADDR,
		.flags = 0,
		.len = 1,
		.buf = &start,
		}, {
		.addr = DDC_ADDR,
		.flags = I2C_M_RD,
		.len = EDID_LENGTH,
		.buf = buf,
		}
		};
		unsigned char *buf;

		buf = kmalloc(EDID_LENGTH, GFP_KERNEL);
		if (!buf) {
		dev_warn(&adapter->dev, "unable to allocate memory for EDID "
		"block.\n");
		return NULL;
		}
		msgs[1].buf = buf;

		if (i2c_transfer(adapter, msgs, 2) == 2)
		return buf;

Admin message