common: Ignore "si.valid" outside of _MAX_SYSINFO_TYPE

Limit the range from 0 to (_MAX_SYSINFO_TYPE - 1) instead of
0 to 31. This way we will never access the lchan->si.buf[] out
of bounds. This is only a theoretical issue though as the code
filling the lchan->si.buf for the SACCH will not have valid
>= _MAX_SYSINFO_TYPE. Add a small regression test to check we
still schedule all SIs.

Fixes: CID 1040765
This commit is contained in:
Holger Hans Peter Freyther 2014-05-22 21:17:49 +02:00
parent ac26607fe4
commit 7996134d2a
8 changed files with 77 additions and 2 deletions

1
.gitignore vendored
View File

@ -36,6 +36,7 @@ tests/agch/agch_test
tests/paging/paging_test
tests/cipher/cipher_test
tests/sysmobts/sysmobts_test
tests/misc/misc_test
tests/testsuite
tests/testsuite.log

View File

@ -75,4 +75,5 @@ AC_OUTPUT(
tests/agch/Makefile
tests/cipher/Makefile
tests/sysmobts/Makefile
tests/misc/Makefile
Makefile)

View File

@ -135,7 +135,7 @@ uint8_t *lchan_sacch_get(struct gsm_lchan *lchan)
{
uint32_t tmp;
for (tmp = lchan->si.last + 1; tmp != lchan->si.last; tmp = (tmp + 1) % 32) {
for (tmp = lchan->si.last + 1; tmp != lchan->si.last; tmp = (tmp + 1) % _MAX_SYSINFO_TYPE) {
if (lchan->si.valid & (1 << tmp)) {
lchan->si.last = tmp;
return lchan->si.buf[tmp];

View File

@ -1,4 +1,4 @@
SUBDIRS = paging cipher sysmobts agch
SUBDIRS = paging cipher sysmobts agch misc
# The `:;' works around a Bash 3.2 bug when the output is not writeable.
$(srcdir)/package.m4: $(top_srcdir)/configure.ac

8
tests/misc/Makefile.am Normal file
View File

@ -0,0 +1,8 @@
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(OPENBSC_INCDIR)
AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS)
LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
noinst_PROGRAMS = misc_test
EXTRA_DIST = misc_test.ok
misc_test_SOURCES = misc_test.c $(srcdir)/../stubs.c
misc_test_LDADD = $(top_builddir)/src/common/libbts.a $(LDADD)

58
tests/misc/misc_test.c Normal file
View File

@ -0,0 +1,58 @@
/* testing misc code */
/* (C) 2011 by Holger Hans Peter Freyther
* (C) 2014 by sysmocom s.f.m.c. GmbH
*
* All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#include <osmo-bts/bts.h>
#include <stdlib.h>
#include <stdio.h>
static void test_sacch_get(void)
{
struct gsm_lchan lchan;
int i, off;
printf("Testing lchan_sacch_get\n");
memset(&lchan, 0, sizeof(lchan));
/* initialize the input. */
for (i = 1; i < _MAX_SYSINFO_TYPE; ++i) {
lchan.si.valid |= (1 << i);
memset(&lchan.si.buf[i], i, sizeof(lchan.si.buf[i]));
}
/* It will start with '1' */
for (i = 1, off = 0; i <= 32; ++i) {
uint8_t *data = lchan_sacch_get(&lchan);
off = (off + 1) % _MAX_SYSINFO_TYPE;
if (off == 0)
off += 1;
//printf("i=%d (%%=%d) -> data[0]=%d\n", i, off, data[0]);
OSMO_ASSERT(data[0] == off);
}
}
int main(int argc, char **argv)
{
test_sacch_get();
return EXIT_SUCCESS;
}

1
tests/misc/misc_test.ok Normal file
View File

@ -0,0 +1 @@
Testing lchan_sacch_get

View File

@ -18,3 +18,9 @@ AT_KEYWORDS([cipher])
cat $abs_srcdir/cipher/cipher_test.ok > expout
AT_CHECK([$OSMO_QEMU $abs_top_builddir/tests/cipher/cipher_test], [], [expout], [ignore])
AT_CLEANUP
AT_SETUP([misc])
AT_KEYWORDS([misc])
cat $abs_srcdir/misc/misc_test.ok > expout
AT_CHECK([$OSMO_QEMU $abs_top_builddir/tests/misc/misc_test], [], [expout], [ignore])
AT_CLEANUP