summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYue Tao <yue.tao@windriver.com>2013-12-05 17:52:18 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-10 17:42:45 +0000
commit42cb2c968b994715532a3c5fde68c8638526b3bf (patch)
tree3b7d8319715b5ee3e2201b69ae01d1be0dab73c0
parentbd477cd98bd8cd959faf2d558a9e61d16cbf350c (diff)
downloadpoky-42cb2c968b994715532a3c5fde68c8638526b3bf.tar.gz
acpid: CVE-2011-1159
acpid.c in acpid before 2.0.9 does not properly handle a situation in which a process has connected to acpid.socket but is not reading any data, which allows local users to cause a denial of service (daemon hang) via a crafted application that performs a connect system call but no read system calls. http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-1159 (From OE-Core rev: e7b2b84dece29d16b8f05daf962b69e78dd64cb3) Signed-off-by: Yue Tao <yue.tao@windriver.com> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/acpid/acpid.inc3
-rw-r--r--meta/recipes-bsp/acpid/acpid/set_socket_noblock.patch10
2 files changed, 12 insertions, 1 deletions
diff --git a/meta/recipes-bsp/acpid/acpid.inc b/meta/recipes-bsp/acpid/acpid.inc
index 40293c5ee4..a384265179 100644
--- a/meta/recipes-bsp/acpid/acpid.inc
+++ b/meta/recipes-bsp/acpid/acpid.inc
@@ -6,7 +6,8 @@ LICENSE="GPLv2+"
6 6
7SECTION = "base" 7SECTION = "base"
8SRC_URI = "${SOURCEFORGE_MIRROR}/acpid/acpid-${PV}.tar.gz \ 8SRC_URI = "${SOURCEFORGE_MIRROR}/acpid/acpid-${PV}.tar.gz \
9 file://init" 9 file://init \
10 file://set_socket_noblock.patch "
10 11
11inherit update-rc.d 12inherit update-rc.d
12 13
diff --git a/meta/recipes-bsp/acpid/acpid/set_socket_noblock.patch b/meta/recipes-bsp/acpid/acpid/set_socket_noblock.patch
new file mode 100644
index 0000000000..54d64351d7
--- /dev/null
+++ b/meta/recipes-bsp/acpid/acpid/set_socket_noblock.patch
@@ -0,0 +1,10 @@
1--- a/acpid.c
2+++ b/acpid.c
3@@ -307,6 +307,7 @@ main(int argc, char **argv)
4 non_root_clients++;
5 }
6 fcntl(cli_fd, F_SETFD, FD_CLOEXEC);
7+ fcntl(cli_fd, F_SETFL, O_NONBLOCK);
8 snprintf(buf, sizeof(buf)-1, "%d[%d:%d]",
9 creds.pid, creds.uid, creds.gid);
10 acpid_add_client(cli_fd, buf);