From 7bb6c06e884b1c29f2fbb74918167fc6567ccf93 Mon Sep 17 00:00:00 2001 From: Eshenko Dmitriy Date: Wed, 30 Jun 2021 01:08:25 +0300 Subject: T42: Add Debian 11 cpack requirements (#19) --- CMakeLists.txt | 2 -- cmake/cpack.cmake | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dd457777..70bf5128 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,4 @@ cmake_minimum_required(VERSION 2.6) -cmake_policy(SET CMP0005 NEW) -cmake_policy(SET CMP0003 OLD) if (CMAKE_BINARY_DIR STREQUAL CMAKE_HOME_DIRECTORY) message(FATAL_ERROR "Building in source directory is forbidden. Please make separated build directory.") diff --git a/cmake/cpack.cmake b/cmake/cpack.cmake index be4c085b..7de53ad6 100644 --- a/cmake/cpack.cmake +++ b/cmake/cpack.cmake @@ -43,6 +43,11 @@ IF(CPACK_TYPE STREQUAL Debian10) INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake) ENDIF(CPACK_TYPE STREQUAL Debian10) +IF(CPACK_TYPE STREQUAL Debian11) + SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.31), libssl1.1 (>= 1.1.1k), libpcre3 (>= 8.39)") + INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake) +ENDIF(CPACK_TYPE STREQUAL Debian11) + IF(CPACK_TYPE STREQUAL Ubuntu16) SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.23), libssl1.0.0 (>= 1.0.0), libpcre3 (>= 8.39)") INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake) -- cgit v1.2.3 From aa9e2eefe4ad51ba6a61ba10abe7dc1ef277700d Mon Sep 17 00:00:00 2001 From: DmitriyEshenko Date: Wed, 30 Jun 2021 22:29:23 +0300 Subject: T43: Change to list_for_each_safe to prevent segmentation fault --- accel-pppd/logs/log_file.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/accel-pppd/logs/log_file.c b/accel-pppd/logs/log_file.c index 216ff5ad..42d9f3f4 100644 --- a/accel-pppd/logs/log_file.c +++ b/accel-pppd/logs/log_file.c @@ -265,8 +265,10 @@ static void general_log(struct log_target_t *t, struct log_msg_t *msg, struct ap static struct ap_private *find_pd(struct ap_session *ses, void *pd_key) { struct ap_private *pd; + struct list_head *pos, *next; - list_for_each_entry(pd, &ses->pd_list, entry) { + list_for_each_safe(pos, next, &ses->pd_list) { + pd = list_entry(pos->next, typeof(*pd), entry); if (pd->key == pd_key) { return pd; } @@ -551,8 +553,8 @@ static void ev_ctrl_started(struct ap_session *ses) } memset(fpd, 0, sizeof(*fpd)); fpd->pd.key = &pd_key3; - list_add_tail(&fpd->pd.entry, &ses->pd_list); INIT_LIST_HEAD(&fpd->msgs); + list_add_tail(&fpd->pd.entry, &ses->pd_list); } } -- cgit v1.2.3 From 2224396d8d184e2c267a9958408e0606541e9d0b Mon Sep 17 00:00:00 2001 From: Vladislav Grishenko Date: Fri, 9 Jul 2021 22:40:00 +0500 Subject: ipoe: dhcpv4: fix address lost due signed overflow fixes a1a2b79240511222868a60960d51f12adbe0d7d4 --- accel-pppd/ctrl/ipoe/dhcpv4.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/accel-pppd/ctrl/ipoe/dhcpv4.c b/accel-pppd/ctrl/ipoe/dhcpv4.c index ffbbcfe4..f1d9c460 100644 --- a/accel-pppd/ctrl/ipoe/dhcpv4.c +++ b/accel-pppd/ctrl/ipoe/dhcpv4.c @@ -105,7 +105,7 @@ static struct dhcpv4_iprange *parse_range(const char *str) pthread_mutex_init(&r->lock, NULL); end -= start; - r->free[(end - 1) / ( 8 * sizeof(long))] &= (1l << ((end - 1) % (8 * sizeof(long)) + 1)) - 1; + r->free[(end - 1) / ( 8 * sizeof(long))] &= (1ul << ((end - 1) % (8 * sizeof(long)) + 1)) - 1; r->free[0] &= ~3; return r; @@ -1179,7 +1179,7 @@ int dhcpv4_get_ip(struct dhcpv4_serv *serv, uint32_t *yiaddr, uint32_t *siaddr, for (i = serv->range->pos; i < serv->range->len; i++) { k = ffsl(serv->range->free[i]); if (k) { - serv->range->free[i] &= ~(1l << (k - 1)); + serv->range->free[i] &= ~(1lu << (k - 1)); serv->range->pos = i; pthread_mutex_unlock(&serv->range->lock); *yiaddr = htonl(serv->range->startip + i * 8 * sizeof(long) + k - 1); @@ -1207,7 +1207,7 @@ void dhcpv4_put_ip(struct dhcpv4_serv *serv, uint32_t ip) return; pthread_mutex_lock(&serv->range->lock); - serv->range->free[n / (8 * sizeof(long))] |= 1l << (n % (8 * sizeof(long))); + serv->range->free[n / (8 * sizeof(long))] |= 1lu << (n % (8 * sizeof(long))); pthread_mutex_unlock(&serv->range->lock); } -- cgit v1.2.3