diff options
| author | Lennart Poettering <lennart@poettering.net> | 2021-10-13 12:38:37 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2021-10-14 15:57:52 +0200 |
| commit | 2f82562bad423d1190912a4b209647dfac966db2 (patch) | |
| tree | 766d61a085ee9674d8034351a83f64bcdf5d45bb /src/udev | |
| parent | 5222651ecc6f46391e5e0d9cf19793bfe65b0ec8 (diff) | |
| download | systemd-2f82562bad423d1190912a4b209647dfac966db2.tar.gz | |
alloc-util: add strdupa_safe() + strndupa_safe() and use it everywhere
Let's define two helpers strdupa_safe() + strndupa_safe() which do the
same as their non-safe counterparts, except that they abort if called
with allocations larger than ALLOCA_MAX.
This should ensure that all our alloca() based allocations are subject
to this limit.
afaics glibc offers three alloca() based APIs: alloca() itself,
strndupa() + strdupa(). With this we have now replacements for all of
them, that take the limit into account.
Diffstat (limited to 'src/udev')
| -rw-r--r-- | src/udev/dmi_memory_id/dmi_memory_id.c | 2 | ||||
| -rw-r--r-- | src/udev/udev-builtin-path_id.c | 2 | ||||
| -rw-r--r-- | src/udev/udev-event.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/udev/dmi_memory_id/dmi_memory_id.c b/src/udev/dmi_memory_id/dmi_memory_id.c index 4c0ec2eccb..14b893ae8f 100644 --- a/src/udev/dmi_memory_id/dmi_memory_id.c +++ b/src/udev/dmi_memory_id/dmi_memory_id.c @@ -183,7 +183,7 @@ static void dmi_memory_device_string( const struct dmi_header *h, uint8_t s) { char *str; - str = strdupa(dmi_string(h, s)); + str = strdupa_safe(dmi_string(h, s)); str = strstrip(str); if (!isempty(str)) printf("MEMORY_DEVICE_%u_%s=%s\n", slot_num, attr_suffix, str); diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c index de1f8dbaa1..b46a1e5af6 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c @@ -337,7 +337,7 @@ static sd_device *handle_scsi_default(sd_device *parent, char **path) { if (!pos) return NULL; - base = strndupa(base, pos - base); + base = strndupa_safe(base, pos - base); dir = opendir(base); if (!dir) return NULL; diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c index 145204b226..0d98b07887 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -223,7 +223,7 @@ static int safe_atou_optional_plus(const char *s, unsigned *ret) { p = endswith(s, "+"); if (p) - s = strndupa(s, p - s); + s = strndupa_safe(s, p - s); r = safe_atou(s, ret); if (r < 0) |