laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33786 )
Change subject: scripts/kernel-test: fixup for initrd_add_file
......................................................................
scripts/kernel-test: fixup for initrd_add_file
The previous versions happened to work too in my testing with
osmo-ggsn. Use the correct loop variable.
Fixes: 0660fc4e ("scripts/kernel-test: adjust to usr-merge")
Change-Id: I0c0ca91116a8cd156b185bb53512371bbcb76515
---
M scripts/kernel-test/initrd-build.sh
1 file changed, 15 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/scripts/kernel-test/initrd-build.sh b/scripts/kernel-test/initrd-build.sh
index 6c17ffa..d942719 100755
--- a/scripts/kernel-test/initrd-build.sh
+++ b/scripts/kernel-test/initrd-build.sh
@@ -10,10 +10,10 @@
for i in "$@"; do
case "$i" in
/bin/*|/sbin/*|/lib/*|/lib64/*)
- cp -a --parents "$@" /tmp/initrd/usr
+ cp -a --parents "$i" /tmp/initrd/usr
;;
*)
- cp -a --parents "$@" /tmp/initrd
+ cp -a --parents "$i" /tmp/initrd
;;
esac
done
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33786
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I0c0ca91116a8cd156b185bb53512371bbcb76515
Gerrit-Change-Number: 33786
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-uecups/+/33788 )
Change subject: daemon_vty: avoid null-dereference in argc < 0 case
......................................................................
daemon_vty: avoid null-dereference in argc < 0 case
in show_gtp_cmd, we have two different checks (argc > 0) vs (argc)
which means in theory argc could be negative and the second clause
would be executed without the first having set up related data such as
'ai'.
Fixes: CID#307521: Explicit null dereferenced (FORWARD_NULL)
Change-Id: I4149b0b191a34168ba6649338d3cdf6c6af6cfe7
---
M daemon/daemon_vty.c
1 file changed, 16 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/88/33788/1
diff --git a/daemon/daemon_vty.c b/daemon/daemon_vty.c
index cfbe421..c5cca74 100644
--- a/daemon/daemon_vty.c
+++ b/daemon/daemon_vty.c
@@ -145,7 +145,7 @@
show_ep_hdr(vty);
pthread_rwlock_rdlock(&g_daemon->rwlock);
- if (argc) {
+ if (argc > 0) {
ep = _gtp_endpoint_find(g_daemon, (const struct sockaddr_storage *) ai->ai_addr);
if (!ep) {
pthread_rwlock_unlock(&g_daemon->rwlock);
--
To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/33788
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-uecups
Gerrit-Branch: master
Gerrit-Change-Id: I4149b0b191a34168ba6649338d3cdf6c6af6cfe7
Gerrit-Change-Number: 33788
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newchange