diff options
| author | Timo Teras <timo.teras@iki.fi> | 2009-07-29 09:05:42 +0300 |
|---|---|---|
| committer | Timo Teras <timo.teras@iki.fi> | 2009-07-29 09:05:42 +0300 |
| commit | 352ce630d7bfd1100a6ace3ba470902fda777c2a (patch) | |
| tree | 78e5d4058853a837708dddfdb3750e2bf1a3739d /main | |
| parent | 492012538ba32abe34f6d089aca269ab94f0262c (diff) | |
| download | aports-352ce630d7bfd1100a6ace3ba470902fda777c2a.tar.bz2 aports-352ce630d7bfd1100a6ace3ba470902fda777c2a.tar.xz | |
main/uclibc: fix a problem with getaddrinfo and netlink (fixes #97)
turns out this was fixed already upstream. just backport the relevant
part of the patch.
Diffstat (limited to 'main')
| -rw-r--r-- | main/uclibc/APKBUILD | 8 | ||||
| -rw-r--r-- | main/uclibc/uclibc-getaddrinfo-netlink.diff | 23 |
2 files changed, 28 insertions, 3 deletions
diff --git a/main/uclibc/APKBUILD b/main/uclibc/APKBUILD index c21385550..36cd3d6fb 100644 --- a/main/uclibc/APKBUILD +++ b/main/uclibc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=uclibc pkgver=0.9.30.1 -pkgrel=12 +pkgrel=13 pkgdesc="C library for developing embedded Linux systems" url=http://uclibc.org license="LGPL-2" @@ -20,6 +20,7 @@ source="http://uclibc.org/downloads/$_mynamever.tar.bz2 uclibc-i386-floating-stacks.diff ppoll.patch uclibc-fork-hook.diff + uclibc-getaddrinfo-netlink.diff uclibcconfig " # backport openat funcs @@ -68,7 +69,8 @@ bbb8475963e791f596c34c81ef5583d7 uclibc-resolv-cname-fix.diff 0b3966ab7774ac42ecf34a7b596c661b uclibc-i386-floating-stacks.diff 60738298e377295d359768a09adac0bb ppoll.patch 55bb709f5efd937df323f0d39a202cfd uclibc-fork-hook.diff +a7310494a8073ebd43e1d437657532ef uclibc-getaddrinfo-netlink.diff +0a87f57d3e5001027f43b7c959d96319 uclibcconfig 329b92fec717c8808c3fa9ffd68f2dfb 0001-first-pass-at-implementing-at-funcs.patch 7ffa41082d9de2bc512b4bed9577bdf9 0002-add-hidden-aliases-for-openat-funcs.patch -e12c647716eef19dd4ad08602dcc435b 0003-remove-libc_hidden_def-mknodat.patch -0a87f57d3e5001027f43b7c959d96319 uclibcconfig" +e12c647716eef19dd4ad08602dcc435b 0003-remove-libc_hidden_def-mknodat.patch" diff --git a/main/uclibc/uclibc-getaddrinfo-netlink.diff b/main/uclibc/uclibc-getaddrinfo-netlink.diff new file mode 100644 index 000000000..d2de3c629 --- /dev/null +++ b/main/uclibc/uclibc-getaddrinfo-netlink.diff @@ -0,0 +1,23 @@ +Fix for netlink code that causes crashes with e.g. ppp or tun +interfaces. + +Basically a back port of c40b05b4c4226b2c4323a9ba5b096377931682ef: + +Author: Denis Vlasenko <vda.linux@googlemail.com> +Date: Tue Dec 9 00:16:11 2008 +0000 + + getaddrinfo: runp->ifa_addr indeed can be NULL, don't dereference it + +Index: uClibc-0.9.30.1/libc/inet/getaddrinfo.c +=================================================================== +--- uClibc-0.9.30.1.orig/libc/inet/getaddrinfo.c 2009-07-29 08:54:52.000000000 +0300 ++++ uClibc-0.9.30.1/libc/inet/getaddrinfo.c 2009-07-29 08:55:16.000000000 +0300 +@@ -187,6 +187,8 @@ + } + + for (runp = ifa; runp != NULL; runp = runp->ifa_next) { ++ if (runp->ifa_addr == NULL) ++ continue; + #if defined __UCLIBC_HAS_IPV4__ + if (runp->ifa_addr->sa_family == PF_INET) + seen |= SEEN_IPV4; |