laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35290?usp=email )
Change subject: socket: Fix uninitialized mem ptr free in osmo_sock_init2_multiaddr2()
......................................................................
socket: Fix uninitialized mem ptr free in osmo_sock_init2_multiaddr2()
The goto tag was wrong, probably due to a copy-paste mistype while
reimplementing the function.
Closes: Coverity CID#336546
Change-Id: I06b810fde7bf750fcb42d6d9e6223883e26f5f0b
---
M src/core/socket.c
1 file changed, 14 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/core/socket.c b/src/core/socket.c
index c600732..5b7489d 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -905,7 +905,7 @@
if (family == AF_INET && loc_has_v6only_addr) {
LOGP(DLGLOBAL, LOGL_ERROR, "Cannot bind an IPv6 address to an AF_INET socket\n");
rc = -EINVAL;
- goto ret_freeaddrinfo;
+ goto ret_freeaddrinfo_loc;
}
}
/* figure out remote side of socket */
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35290?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I06b810fde7bf750fcb42d6d9e6223883e26f5f0b
Gerrit-Change-Number: 35290
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35288?usp=email )
Change subject: gsm_data: fix wrong variable set in gsm_pchan2chan_nr()
......................................................................
gsm_data: fix wrong variable set in gsm_pchan2chan_nr()
I believe the actual intention was to reset the 'lchan_nr' variable,
and not the 'chan_nr'. The 'lchan_nr' is used to compose the 'cbits':
cbits = 0x04;
cbits += lchan_nr;
If the value is 4, then the result is:
cbits = 0x04 + 4 = 0x08
which corresponds to SDCCH8 (not SDCCH4), and is clearly wrong.
Change-Id: Ic9c7c2e46e24dab0b721221e9adcbbae2ca56d23
Fixes: ec1b5a0e9 "gsm_ts2chan_nr(): add assertions for lchan_nr"
Fixes: CID#336586
---
M src/osmo-bsc/gsm_data.c
1 file changed, 25 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c
index 580fa84..4d77e75 100644
--- a/src/osmo-bsc/gsm_data.c
+++ b/src/osmo-bsc/gsm_data.c
@@ -485,8 +485,8 @@
* See osmo-bts-xxx/oml.c:opstart_compl().
*/
if (lchan_nr == CCCH_LCHAN)
- chan_nr = 0;
- else if (lchan_nr >= 4)
+ lchan_nr = 0;
+ else if (lchan_nr > 4)
return -EINVAL;
cbits = 0x04;
cbits += lchan_nr;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35288?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ic9c7c2e46e24dab0b721221e9adcbbae2ca56d23
Gerrit-Change-Number: 35288
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged