Skip to content

Commit 31a2118

Browse files
committed
platform/x86: dell-smbios-wmi: Avoid false-positive memcpy() warning
jira LE-2157 Rebuild_History Non-Buildable kernel-5.14.0-503.14.1.el9_5 commit-author Kees Cook <keescook@chromium.org> commit fb49d99 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 <hdegoede@redhat.com> Cc: Mark Gross <mgross@linux.intel.com> Cc: Mario Limonciello <mario.limonciello@dell.com> Cc: "Pali Rohár" <pali@kernel.org> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de> Cc: Dell.Client.Kernel@dell.com Cc: platform-driver-x86@vger.kernel.org Reported-by: Andy Lavr <andy.lavr@gmail.com> Signed-off-by: Kees Cook <keescook@chromium.org> Link: https://lore.kernel.org/r/20210825160749.3891090-1-keescook@chromium.org Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> (cherry picked from commit fb49d99) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent 687707d commit 31a2118

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)