From a14de301538c0fbb35d0ffe4d011de15af2b3419 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mon, 14 Dec 2020 11:38:18 +0000 Subject: [PATCH] trivial: Require for strlen() and memcpy() --- libfwupd/fwupd-plugin.c | 2 ++ libfwupd/fwupd-security-attr.c | 1 + libfwupdplugin/fu-dfu-firmware.c | 2 ++ libfwupdplugin/fu-fmap-firmware.c | 2 ++ plugins/bcm57xx/fu-bcm57xx-common.c | 2 ++ plugins/bcm57xx/fu-bcm57xx-device.c | 1 + plugins/bcm57xx/fu-bcm57xx-recovery-device.c | 1 + plugins/ccgx/fu-ccgx-dmc-firmware.c | 2 ++ plugins/ccgx/fu-ccgx-firmware.c | 2 ++ plugins/ccgx/fu-ccgx-hpi-device.c | 2 ++ plugins/goodix-moc/fu-goodixmoc-common.c | 1 + plugins/jabra/fu-jabra-device.c | 2 ++ .../synaptics-cxaudio/fu-synaptics-cxaudio-firmware.c | 2 ++ plugins/synaptics-prometheus/fu-synaprom-firmware.c | 1 + plugins/vli/fu-vli-usbhub-rtd21xx-device.c | 9 ++++++--- src/fu-keyring-utils.c | 1 + 16 files changed, 30 insertions(+), 3 deletions(-) diff --git a/libfwupd/fwupd-plugin.c b/libfwupd/fwupd-plugin.c index e27820521..cbf48db48 100644 --- a/libfwupd/fwupd-plugin.c +++ b/libfwupd/fwupd-plugin.c @@ -6,6 +6,8 @@ #include "config.h" +#include + #include "fwupd-enums-private.h" #include "fwupd-plugin-private.h" diff --git a/libfwupd/fwupd-security-attr.c b/libfwupd/fwupd-security-attr.c index 1adeabd73..e2f3e8e25 100644 --- a/libfwupd/fwupd-security-attr.c +++ b/libfwupd/fwupd-security-attr.c @@ -7,6 +7,7 @@ #include "config.h" #include +#include #include "fwupd-common-private.h" #include "fwupd-enums-private.h" diff --git a/libfwupdplugin/fu-dfu-firmware.c b/libfwupdplugin/fu-dfu-firmware.c index 8247e2a73..3933a18b6 100644 --- a/libfwupdplugin/fu-dfu-firmware.c +++ b/libfwupdplugin/fu-dfu-firmware.c @@ -8,6 +8,8 @@ #include "config.h" +#include + #include "fu-common.h" #include "fu-dfu-firmware.h" diff --git a/libfwupdplugin/fu-fmap-firmware.c b/libfwupdplugin/fu-fmap-firmware.c index 0d45c2e3a..5369601e6 100644 --- a/libfwupdplugin/fu-fmap-firmware.c +++ b/libfwupdplugin/fu-fmap-firmware.c @@ -6,6 +6,8 @@ #include "config.h" +#include + #include "fu-common.h" #include "fu-fmap-firmware.h" diff --git a/plugins/bcm57xx/fu-bcm57xx-common.c b/plugins/bcm57xx/fu-bcm57xx-common.c index 88639ed66..dc123f844 100644 --- a/plugins/bcm57xx/fu-bcm57xx-common.c +++ b/plugins/bcm57xx/fu-bcm57xx-common.c @@ -7,6 +7,8 @@ #include "config.h" +#include + #include "fu-common.h" #include "fu-bcm57xx-common.h" diff --git a/plugins/bcm57xx/fu-bcm57xx-device.c b/plugins/bcm57xx/fu-bcm57xx-device.c index b06cc66bd..f4dc08db4 100644 --- a/plugins/bcm57xx/fu-bcm57xx-device.c +++ b/plugins/bcm57xx/fu-bcm57xx-device.c @@ -10,6 +10,7 @@ #ifdef HAVE_ERRNO_H #include #endif +#include #include #ifdef HAVE_ETHTOOL_H #include diff --git a/plugins/bcm57xx/fu-bcm57xx-recovery-device.c b/plugins/bcm57xx/fu-bcm57xx-recovery-device.c index a2e4d12f2..b788f1dfc 100644 --- a/plugins/bcm57xx/fu-bcm57xx-recovery-device.c +++ b/plugins/bcm57xx/fu-bcm57xx-recovery-device.c @@ -12,6 +12,7 @@ #include #include #include +#include #ifdef HAVE_MMAN_H #include #endif diff --git a/plugins/ccgx/fu-ccgx-dmc-firmware.c b/plugins/ccgx/fu-ccgx-dmc-firmware.c index 6d54d300c..22a3d8b99 100644 --- a/plugins/ccgx/fu-ccgx-dmc-firmware.c +++ b/plugins/ccgx/fu-ccgx-dmc-firmware.c @@ -7,6 +7,8 @@ #include "config.h" +#include + #include "fu-common.h" #include "fu-common-version.h" #include "fu-ccgx-dmc-common.h" diff --git a/plugins/ccgx/fu-ccgx-firmware.c b/plugins/ccgx/fu-ccgx-firmware.c index 03ee7eab0..8ec1fe59e 100644 --- a/plugins/ccgx/fu-ccgx-firmware.c +++ b/plugins/ccgx/fu-ccgx-firmware.c @@ -7,6 +7,8 @@ #include "config.h" +#include + #include "fu-common.h" #include "fu-common-version.h" #include "fu-firmware-common.h" diff --git a/plugins/ccgx/fu-ccgx-hpi-device.c b/plugins/ccgx/fu-ccgx-hpi-device.c index 2dd24315d..5b8bd0dc4 100644 --- a/plugins/ccgx/fu-ccgx-hpi-device.c +++ b/plugins/ccgx/fu-ccgx-hpi-device.c @@ -7,6 +7,8 @@ #include "config.h" +#include + #include "fu-chunk.h" #include "fu-ccgx-common.h" diff --git a/plugins/goodix-moc/fu-goodixmoc-common.c b/plugins/goodix-moc/fu-goodixmoc-common.c index edcb582d6..0df1f8e0e 100644 --- a/plugins/goodix-moc/fu-goodixmoc-common.c +++ b/plugins/goodix-moc/fu-goodixmoc-common.c @@ -8,6 +8,7 @@ #include "config.h" #include +#include #include "fu-common.h" #include "fu-goodixmoc-common.h" diff --git a/plugins/jabra/fu-jabra-device.c b/plugins/jabra/fu-jabra-device.c index c77acf112..7a6aff9a8 100644 --- a/plugins/jabra/fu-jabra-device.c +++ b/plugins/jabra/fu-jabra-device.c @@ -6,6 +6,8 @@ #include "config.h" +#include + #include "fu-firmware-common.h" #include "fu-jabra-device.h" diff --git a/plugins/synaptics-cxaudio/fu-synaptics-cxaudio-firmware.c b/plugins/synaptics-cxaudio/fu-synaptics-cxaudio-firmware.c index 16b81031c..f08c43b64 100644 --- a/plugins/synaptics-cxaudio/fu-synaptics-cxaudio-firmware.c +++ b/plugins/synaptics-cxaudio/fu-synaptics-cxaudio-firmware.c @@ -7,6 +7,8 @@ #include "config.h" +#include + #include "fu-common.h" #include "fu-synaptics-cxaudio-firmware.h" diff --git a/plugins/synaptics-prometheus/fu-synaprom-firmware.c b/plugins/synaptics-prometheus/fu-synaprom-firmware.c index 6df8c6fac..d37d83344 100644 --- a/plugins/synaptics-prometheus/fu-synaprom-firmware.c +++ b/plugins/synaptics-prometheus/fu-synaprom-firmware.c @@ -7,6 +7,7 @@ #include "config.h" +#include #include #include "fu-common.h" diff --git a/plugins/vli/fu-vli-usbhub-rtd21xx-device.c b/plugins/vli/fu-vli-usbhub-rtd21xx-device.c index 482c1a604..56ba41f1b 100644 --- a/plugins/vli/fu-vli-usbhub-rtd21xx-device.c +++ b/plugins/vli/fu-vli-usbhub-rtd21xx-device.c @@ -56,12 +56,15 @@ fu_vli_usbhub_device_i2c_write (FuVliUsbhubDevice *self, GError **error) { GUsbDevice *usb_device = fu_usb_device_get_dev (FU_USB_DEVICE (self)); - g_autofree guint8 *buf = g_malloc0 (datasz + 2); + gsize bufsz = datasz + 2; + g_autofree guint8 *buf = g_malloc0 (bufsz); buf[0] = slave_addr; buf[1] = sub_addr; - memcpy (buf + 2, data, datasz); - + if (!fu_memcpy_safe (buf, bufsz, 0x2, /* dst */ + data, datasz, 0x0, /* src */ + datasz, error)) + return FALSE; if (g_getenv ("FWUPD_VLI_USBHUB_VERBOSE") != NULL) fu_common_dump_raw (G_LOG_DOMAIN, "I2cWriteData", buf, datasz + 2); if (!g_usb_device_control_transfer (usb_device, diff --git a/src/fu-keyring-utils.c b/src/fu-keyring-utils.c index 409220e67..42462b9ef 100644 --- a/src/fu-keyring-utils.c +++ b/src/fu-keyring-utils.c @@ -7,6 +7,7 @@ #define G_LOG_DOMAIN "FuKeyring" #include +#include #include "fwupd-error.h"