Skip to content

Commit fb49d99

Browse files
keesjwrdegoede
authored andcommitted
platform/x86: dell-smbios-wmi: Avoid false-positive memcpy() warning
In preparation for FORTIFY_SOURCE performing compile-time and run-time field bounds checking for memcpy(), memmove(), and memset(), avoid intentionally writing across neighboring fields. Since all the size checking has already happened, use input.pointer (void *) so memcpy() doesn't get confused about how much is being written. Avoids this false-positive warning when run-time memcpy() strict bounds checking is enabled: memcpy: detected field-spanning write (size 4096) of single field (size 36) WARNING: CPU: 0 PID: 357 at drivers/platform/x86/dell/dell-smbios-wmi.c:74 run_smbios_call+0x110/0x1e0 [dell_smbios] Cc: Hans de Goede <[email protected]> Cc: Mark Gross <[email protected]> Cc: Mario Limonciello <[email protected]> Cc: "Pali Rohár" <[email protected]> Cc: Andy Shevchenko <[email protected]> Cc: "Uwe Kleine-König" <[email protected]> Cc: [email protected] Cc: [email protected] Reported-by: Andy Lavr <[email protected]> Signed-off-by: Kees Cook <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Hans de Goede <[email protected]> Signed-off-by: Hans de Goede <[email protected]>
1 parent 55879dc commit fb49d99

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/platform/x86/dell/dell-smbios-wmi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ static int run_smbios_call(struct wmi_device *wdev)
7171
obj->integer.value);
7272
return -EIO;
7373
}
74-
memcpy(&priv->buf->std, obj->buffer.pointer, obj->buffer.length);
74+
memcpy(input.pointer, obj->buffer.pointer, obj->buffer.length);
7575
dev_dbg(&wdev->dev, "result: [%08x,%08x,%08x,%08x]\n",
7676
priv->buf->std.output[0], priv->buf->std.output[1],
7777
priv->buf->std.output[2], priv->buf->std.output[3]);

0 commit comments

Comments
 (0)