From 0ae39b3ccab604fadaa28918dc5ff717c73f5bd2 Mon Sep 17 00:00:00 2001 From: Kozlov Dmitry Date: Sat, 7 Jul 2012 16:14:54 +0400 Subject: iprange: accept network with null mask (which actually disables iprange module) --- accel-pppd/iprange.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'accel-pppd') diff --git a/accel-pppd/iprange.c b/accel-pppd/iprange.c index 315a572..c3bf2fe 100644 --- a/accel-pppd/iprange.c +++ b/accel-pppd/iprange.c @@ -42,7 +42,7 @@ static struct iprange_t *parse1(const char *str) return NULL; if (f4 > 255) return NULL; - if (m == 0 || m > 32) + if (m > 32) return NULL; r = _malloc(sizeof(*r)); @@ -94,11 +94,8 @@ static void load_ranges(struct list_head *list, const char *conf_sect) } list_for_each_entry(opt, &s->items, entry) { - if (!strcmp(opt->name, "disable")) { - conf_disable = 1; - log_emerg("iprange: iprange module disabled so improper ip address assigning may cause kernel soft lockup!\n"); - continue; - } + if (!strcmp(opt->name, "disable")) + goto disable; r = parse1(opt->name); if (!r) r = parse2(opt->name); @@ -106,8 +103,15 @@ static void load_ranges(struct list_head *list, const char *conf_sect) log_emerg("iprange: cann't parse '%s' in '%s'\n", opt->name, conf_sect); _exit(EXIT_FAILURE); } + if (r->begin == r->end) + goto disable; list_add_tail(&r->entry, list); } + + return; +disable: + conf_disable = 1; + log_emerg("iprange: iprange module disabled so improper ip address assigning may cause kernel soft lockup!\n"); } static int check_range(struct list_head *list, in_addr_t ipaddr) -- cgit v1.2.3 From 0b99fef73bce3f1abed63e581594de9d1f132312 Mon Sep 17 00:00:00 2001 From: Guillaume Nault Date: Thu, 12 Jul 2012 15:22:07 +0200 Subject: L2TP: Fix socket() error handling in l2tp_connect() Check if the tunnel file descriptor has been successfully created. Explicitely check for negative values to detect socket() errors. Signed-off-by: Guillaume Nault --- accel-pppd/ctrl/l2tp/l2tp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'accel-pppd') diff --git a/accel-pppd/ctrl/l2tp/l2tp.c b/accel-pppd/ctrl/l2tp/l2tp.c index d8a98f8..5bba25e 100644 --- a/accel-pppd/ctrl/l2tp/l2tp.c +++ b/accel-pppd/ctrl/l2tp/l2tp.c @@ -384,7 +384,7 @@ static int l2tp_connect(struct l2tp_conn_t *conn) pppox_addr.pppol2tp.d_tunnel = conn->peer_tid; conn->tunnel_fd = socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_OL2TP); - if (!conn->ppp.fd) { + if (conn->tunnel_fd < 0) { log_ppp_error("l2tp: socket(AF_PPPOX): %s\n", strerror(errno)); return -1; } @@ -392,13 +392,13 @@ static int l2tp_connect(struct l2tp_conn_t *conn) fcntl(conn->tunnel_fd, F_SETFD, fcntl(conn->tunnel_fd, F_GETFD) | FD_CLOEXEC); conn->ppp.fd = socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_OL2TP); - if (!conn->ppp.fd) { + if (conn->ppp.fd < 0) { close(conn->tunnel_fd); conn->tunnel_fd = -1; log_ppp_error("l2tp: socket(AF_PPPOX): %s\n", strerror(errno)); return -1; } - + fcntl(conn->ppp.fd, F_SETFD, fcntl(conn->ppp.fd, F_GETFD) | FD_CLOEXEC); if (connect(conn->tunnel_fd, (struct sockaddr *)&pppox_addr, sizeof(pppox_addr)) < 0) { -- cgit v1.2.3