diff options
| author | Florian Weimer <fweimer@redhat.com> | 2018-11-27 16:12:43 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2018-11-27 18:12:49 +0100 |
| commit | d527c860f5a3f0ed687bd03f0cb464612dc23408 (patch) | |
| tree | e2aaa3fa759808a9fcfd3ef80a73131864deee7b /sysdeps | |
| parent | 979cfed05d0ee5a9d81d310ea1eb2d590739e36b (diff) | |
| download | glibc-d527c860f5a3f0ed687bd03f0cb464612dc23408.tar.gz glibc-d527c860f5a3f0ed687bd03f0cb464612dc23408.tar.xz glibc-d527c860f5a3f0ed687bd03f0cb464612dc23408.zip | |
CVE-2018-19591: if_nametoindex: Fix descriptor for overlong name [BZ #23927]
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/unix/sysv/linux/if_index.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sysdeps/unix/sysv/linux/if_index.c b/sysdeps/unix/sysv/linux/if_index.c index e3d08982d9..782fc5e175 100644 --- a/sysdeps/unix/sysv/linux/if_index.c +++ b/sysdeps/unix/sysv/linux/if_index.c @@ -38,11 +38,6 @@ __if_nametoindex (const char *ifname) return 0; #else struct ifreq ifr; - int fd = __opensock (); - - if (fd < 0) - return 0; - if (strlen (ifname) >= IFNAMSIZ) { __set_errno (ENODEV); @@ -50,6 +45,12 @@ __if_nametoindex (const char *ifname) } strncpy (ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); + + int fd = __opensock (); + + if (fd < 0) + return 0; + if (__ioctl (fd, SIOCGIFINDEX, &ifr) < 0) { int saved_errno = errno; |