| commit | 4ad65befd1fd525df4257f0e95e8b93f89ef0bff | [log] [tgz] |
|---|---|---|
| author | JP Abgrall <jpa@google.com> | Fri Nov 14 00:47:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 14 00:47:18 2014 +0000 |
| tree | 0fe10f0f91fb7a1a5069dcac3ca029fcb6988229 | |
| parent | 08807417a7d0d2f857c181f914cd12972fe8988e [diff] | |
| parent | d707b7f99357b521e01c0b11489a3b17b04a2a2d [diff] |
am d707b7f9: am b0a10b53: Merge "Fix segfault in get_character_device_symlinks()" * commit 'd707b7f99357b521e01c0b11489a3b17b04a2a2d': Fix segfault in get_character_device_symlinks()
diff --git a/init/devices.c b/init/devices.c index 2fa5c22..a95111a 100644 --- a/init/devices.c +++ b/init/devices.c
@@ -458,7 +458,7 @@ /* skip "/devices/platform/<driver>" */ parent = strchr(uevent->path + pdev->path_len, '/'); - if (!*parent) + if (!parent) goto err; if (!strncmp(parent, "/usb", 4)) {