diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2015-01-15 12:38:57 +0100 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2015-01-17 09:26:12 -0500 |
| commit | 1fd8fecb5f962def553e41df7d57d54b6d514197 (patch) | |
| tree | c8bf82ba8f85278fb693ed8b190d09132ec9618b | |
| parent | e155f21d67540392c28ca71aebe3321785d6fa9f (diff) | |
udev: fix NULL-ptr deref
Make sure we properly validate the return value of
udev_device_get_sysattr_value(). It might be NULL for several reasons.
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
| -rw-r--r-- | src/udev/udev-builtin-input_id.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c index a3289128b3..e6fd077260 100644 --- a/src/udev/udev-builtin-input_id.c +++ b/src/udev/udev-builtin-input_id.c @@ -4,6 +4,7 @@ * Copyright (C) 2009 Martin Pitt <martin.pitt@ubuntu.com> * Portions Copyright (C) 2004 David Zeuthen, <david@fubar.dk> * Copyright (C) 2011 Kay Sievers <kay@vrfy.org> + * Copyright (C) 2014 David Herrmann <dh.herrmann@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -48,12 +49,17 @@ static void get_cap_mask(struct udev_device *dev, struct udev_device *pdev, const char* attr, unsigned long *bitmask, size_t bitmask_size, bool test) { + const char *v; char text[4096]; unsigned i; char* word; unsigned long val; - snprintf(text, sizeof(text), "%s", udev_device_get_sysattr_value(pdev, attr)); + v = udev_device_get_sysattr_value(pdev, attr); + if (!v) + v = ""; + + snprintf(text, sizeof(text), "%s", v); log_debug("%s raw kernel attribute: %s", attr, text); memzero(bitmask, bitmask_size); |