January 2022 - gerrit-log - lists.osmocom.org

Change in libosmocore[master]: osmo_libusb: Fix NULL check in osmo_usb_removed_cb()

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26972 ) Change subject: osmo_libusb: Fix NULL check in osmo_usb_removed_cb() ...................................................................... osmo_libusb: Fix NULL check in osmo_usb_removed_cb() Thread 1 "simtrace2-tool" received signal SIGSEGV, Segmentation fault. 0x00007ffff73dd2a0 in llist_del (entry=0x0) at ../include/osmocom/core/linuxlist.h:130 130 __llist_del(entry->prev, entry->next); (gdb) bt Change-Id: I2b7ab8dddd69453826053663dd5589a941c2e47d --- M src/usb/osmo_libusb.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/usb/osmo_libusb.c b/src/usb/osmo_libusb.c index 05331a1..a6f194a 100644 --- a/src/usb/osmo_libusb.c +++ b/src/usb/osmo_libusb.c @@ -99,7 +99,7 @@ static void osmo_usb_removed_cb(int fd, void *user_data) { struct osmo_fd *ofd = osmo_fd_get_by_fd(fd); - if (!fd) + if (!ofd) return; osmo_fd_unregister(ofd); talloc_free(ofd); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2b7ab8dddd69453826053663dd5589a941c2e47d Gerrit-Change-Number: 26972 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 7 months

1
0
0 0

Change in libosmocore[master]: osmo_libusb: Fix NULL check in osmo_usb_removed_cb()

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26972 ) Change subject: osmo_libusb: Fix NULL check in osmo_usb_removed_cb() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2b7ab8dddd69453826053663dd5589a941c2e47d Gerrit-Change-Number: 26972 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 25 Jan 2022 16:02:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 7 months

1
0
0 0

Change in simtrace2[master]: host: Print strerror(errno) in case of problems opening the USB device

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26973 ) Change subject: host: Print strerror(errno) in case of problems opening the USB device ...................................................................... host: Print strerror(errno) in case of problems opening the USB device Change-Id: If446bf08655739281f616df952714751fe9a3b18 --- M host/src/simtrace2-cardem-pcsc.c M host/src/simtrace2-sniff.c M host/src/simtrace2-tool.c 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index 2806b0f..3ec7509 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -561,7 +561,7 @@ transp->usb_async = true; transp->usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, ifm); if (!transp->usb_devh) { - fprintf(stderr, "can't open USB device\n"); + fprintf(stderr, "can't open USB device: %s\n", strerror(errno)); goto close; } diff --git a/host/src/simtrace2-sniff.c b/host/src/simtrace2-sniff.c index a4eccb2..c223008 100644 --- a/host/src/simtrace2-sniff.c +++ b/host/src/simtrace2-sniff.c @@ -472,7 +472,7 @@ do { _transp.usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, &ifm_selected); if (!_transp.usb_devh) { - fprintf(stderr, "can't open USB device\n"); + fprintf(stderr, "can't open USB device: %s\n", strerror(errno)); goto close_exit; } diff --git a/host/src/simtrace2-tool.c b/host/src/simtrace2-tool.c index eb61ee2..d705796 100644 --- a/host/src/simtrace2-tool.c +++ b/host/src/simtrace2-tool.c @@ -313,7 +313,7 @@ osmo_strlcpy(ifm->path, path, sizeof(ifm->path)); transp->usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, ifm); if (!transp->usb_devh) { - fprintf(stderr, "can't open USB device\n"); + fprintf(stderr, "can't open USB device: %s\n", strerror(errno)); goto close_exit; } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: If446bf08655739281f616df952714751fe9a3b18 Gerrit-Change-Number: 26973 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 7 months

1
0
0 0

Change in simtrace2[master]: cosmetic: Fix indent of printf() statement

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26974 ) Change subject: cosmetic: Fix indent of printf() statement ...................................................................... cosmetic: Fix indent of printf() statement Change-Id: I9f5c9f7720b3bc3c8d5df9750b031d8bcf2dd435 --- M host/src/simtrace2-sniff.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/host/src/simtrace2-sniff.c b/host/src/simtrace2-sniff.c index c223008..8504e8b 100644 --- a/host/src/simtrace2-sniff.c +++ b/host/src/simtrace2-sniff.c @@ -442,9 +442,9 @@ } struct usb_interface_match ifm_selected = ifm_filtered[0]; printf("Using USB device %04x:%04x Addr=%u, Path=%s, Cfg=%u, Intf=%u, Alt=%u: %d/%d/%d ", - ifm_selected.vendor, ifm_selected.product, ifm_selected.addr, ifm_selected.path, - ifm_selected.configuration, ifm_selected.interface, ifm_selected.altsetting, - ifm_selected.class, ifm_selected.sub_class, ifm_selected.protocol); + ifm_selected.vendor, ifm_selected.product, ifm_selected.addr, ifm_selected.path, + ifm_selected.configuration, ifm_selected.interface, ifm_selected.altsetting, + ifm_selected.class, ifm_selected.sub_class, ifm_selected.protocol); libusb_device_handle *dev_handle; rc = libusb_open(ifm_selected.usb_dev, &dev_handle); if (rc < 0) { -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I9f5c9f7720b3bc3c8d5df9750b031d8bcf2dd435 Gerrit-Change-Number: 26974 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 7 months

1
0
0 0

Change in simtrace2[master]: cosmetic: Fix indent of printf() statement

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26974 ) Change subject: cosmetic: Fix indent of printf() statement ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I9f5c9f7720b3bc3c8d5df9750b031d8bcf2dd435 Gerrit-Change-Number: 26974 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 25 Jan 2022 16:02:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 7 months

1
0
0 0

Change in simtrace2[master]: host: Print strerror(errno) in case of problems opening the USB device

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26973 ) Change subject: host: Print strerror(errno) in case of problems opening the USB device ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: If446bf08655739281f616df952714751fe9a3b18 Gerrit-Change-Number: 26973 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 25 Jan 2022 16:02:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 7 months

1
0
0 0

Change in simtrace2[master]: host: properly zero-initialize interface match structures

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/26975 ) Change subject: host: properly zero-initialize interface match structures ...................................................................... host: properly zero-initialize interface match structures This can lead to some fields not properly zero-initialized, fooling our matching code into the application having requested certain fields to match ('0' is usually assumed to be unspecified). Change-Id: I304d55b584e37d9dccb75b24057bb682f799beb2 --- M host/src/simtrace2-cardem-pcsc.c M host/src/simtrace2-tool.c 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/75/26975/1 diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index 3ec7509..8b08f36 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -549,6 +549,7 @@ do { struct usb_interface_match _ifm, *ifm = &_ifm; + memset(ifm, 0, sizeof(*ifm)); ifm->vendor = vendor_id; ifm->product = product_id; ifm->configuration = config_id; diff --git a/host/src/simtrace2-tool.c b/host/src/simtrace2-tool.c index d705796..9c9b5ed 100644 --- a/host/src/simtrace2-tool.c +++ b/host/src/simtrace2-tool.c @@ -303,6 +303,7 @@ do { if (transp->udp_fd < 0) { struct usb_interface_match _ifm, *ifm = &_ifm; + memset(ifm, 0, sizeof(*ifm)); ifm->vendor = vendor_id; ifm->product = product_id; ifm->configuration = config_id; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26975 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I304d55b584e37d9dccb75b24057bb682f799beb2 Gerrit-Change-Number: 26975 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 7 months

1
0
0 0

Change in simtrace2[master]: host: Print strerror(errno) in case of problems opening the USB device

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/26973 ) Change subject: host: Print strerror(errno) in case of problems opening the USB device ...................................................................... host: Print strerror(errno) in case of problems opening the USB device Change-Id: If446bf08655739281f616df952714751fe9a3b18 --- M host/src/simtrace2-cardem-pcsc.c M host/src/simtrace2-sniff.c M host/src/simtrace2-tool.c 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/73/26973/1 diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index 2806b0f..3ec7509 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -561,7 +561,7 @@ transp->usb_async = true; transp->usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, ifm); if (!transp->usb_devh) { - fprintf(stderr, "can't open USB device\n"); + fprintf(stderr, "can't open USB device: %s\n", strerror(errno)); goto close; } diff --git a/host/src/simtrace2-sniff.c b/host/src/simtrace2-sniff.c index a4eccb2..c223008 100644 --- a/host/src/simtrace2-sniff.c +++ b/host/src/simtrace2-sniff.c @@ -472,7 +472,7 @@ do { _transp.usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, &ifm_selected); if (!_transp.usb_devh) { - fprintf(stderr, "can't open USB device\n"); + fprintf(stderr, "can't open USB device: %s\n", strerror(errno)); goto close_exit; } diff --git a/host/src/simtrace2-tool.c b/host/src/simtrace2-tool.c index eb61ee2..d705796 100644 --- a/host/src/simtrace2-tool.c +++ b/host/src/simtrace2-tool.c @@ -313,7 +313,7 @@ osmo_strlcpy(ifm->path, path, sizeof(ifm->path)); transp->usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, ifm); if (!transp->usb_devh) { - fprintf(stderr, "can't open USB device\n"); + fprintf(stderr, "can't open USB device: %s\n", strerror(errno)); goto close_exit; } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: If446bf08655739281f616df952714751fe9a3b18 Gerrit-Change-Number: 26973 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 7 months

1
0
0 0

Change in simtrace2[master]: cosmetic: Fix indent of printf() statement

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/26974 ) Change subject: cosmetic: Fix indent of printf() statement ...................................................................... cosmetic: Fix indent of printf() statement Change-Id: I9f5c9f7720b3bc3c8d5df9750b031d8bcf2dd435 --- M host/src/simtrace2-sniff.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/74/26974/1 diff --git a/host/src/simtrace2-sniff.c b/host/src/simtrace2-sniff.c index c223008..8504e8b 100644 --- a/host/src/simtrace2-sniff.c +++ b/host/src/simtrace2-sniff.c @@ -442,9 +442,9 @@ } struct usb_interface_match ifm_selected = ifm_filtered[0]; printf("Using USB device %04x:%04x Addr=%u, Path=%s, Cfg=%u, Intf=%u, Alt=%u: %d/%d/%d ", - ifm_selected.vendor, ifm_selected.product, ifm_selected.addr, ifm_selected.path, - ifm_selected.configuration, ifm_selected.interface, ifm_selected.altsetting, - ifm_selected.class, ifm_selected.sub_class, ifm_selected.protocol); + ifm_selected.vendor, ifm_selected.product, ifm_selected.addr, ifm_selected.path, + ifm_selected.configuration, ifm_selected.interface, ifm_selected.altsetting, + ifm_selected.class, ifm_selected.sub_class, ifm_selected.protocol); libusb_device_handle *dev_handle; rc = libusb_open(ifm_selected.usb_dev, &dev_handle); if (rc < 0) { -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I9f5c9f7720b3bc3c8d5df9750b031d8bcf2dd435 Gerrit-Change-Number: 26974 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 7 months

1
0
0 0

Change in libosmocore[master]: osmo_libusb: Fix NULL check in osmo_usb_removed_cb()

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/26972 ) Change subject: osmo_libusb: Fix NULL check in osmo_usb_removed_cb() ...................................................................... osmo_libusb: Fix NULL check in osmo_usb_removed_cb() Thread 1 "simtrace2-tool" received signal SIGSEGV, Segmentation fault. 0x00007ffff73dd2a0 in llist_del (entry=0x0) at ../include/osmocom/core/linuxlist.h:130 130 __llist_del(entry->prev, entry->next); (gdb) bt Change-Id: I2b7ab8dddd69453826053663dd5589a941c2e47d --- M src/usb/osmo_libusb.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/26972/1 diff --git a/src/usb/osmo_libusb.c b/src/usb/osmo_libusb.c index 05331a1..a6f194a 100644 --- a/src/usb/osmo_libusb.c +++ b/src/usb/osmo_libusb.c @@ -99,7 +99,7 @@ static void osmo_usb_removed_cb(int fd, void *user_data) { struct osmo_fd *ofd = osmo_fd_get_by_fd(fd); - if (!fd) + if (!ofd) return; osmo_fd_unregister(ofd); talloc_free(ofd); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2b7ab8dddd69453826053663dd5589a941c2e47d Gerrit-Change-Number: 26972 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log January 2022