Skip to content

Signed integer overflow in INT32_BITFIELD_SET #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
udf2457 wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −2
Open

Signed integer overflow in INT32_BITFIELD_SET #247

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/tini.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <unistd.h>
#include <stdbool.h>
#include <libgen.h>
#include <stdint.h>

#include "tiniConfig.h"
#include "tiniLicense.h"
Expand All @@ -37,7 +38,6 @@

#define ARRAY_LEN(x) (sizeof(x) / sizeof((x)[0]))

#define INT32_BITFIELD_SET(F, i) ( F[(i / 32)] |= (1 << (i % 32)) )
#define INT32_BITFIELD_CLEAR(F, i) ( F[(i / 32)] &= ~(1 << (i % 32)) )
#define INT32_BITFIELD_TEST(F, i) ( F[(i / 32)] & (1 << (i % 32)) )
#define INT32_BITFIELD_CHECK_BOUNDS(F, i) do { assert(i >= 0); assert(ARRAY_LEN(F) > (uint) (i / 32)); } while(0)
Expand Down Expand Up @@ -85,6 +85,10 @@ static const struct {
{ "SIGSYS", SIGSYS },
};

static inline void int32_bitfield_set(uint32_t *F, unsigned int i) {
F[i / 32] |= (1U << (i % 32));
}

static unsigned int verbosity = DEFAULT_VERBOSITY;

static int32_t expect_status[(STATUS_MAX - STATUS_MIN + 1) / 32];
Expand Down Expand Up @@ -308,7 +312,7 @@ int add_expect_status(char* arg) {
}

INT32_BITFIELD_CHECK_BOUNDS(expect_status, status);
INT32_BITFIELD_SET(expect_status, status);
int32_bitfield_set(expect_status, status);
return 0;
}

Expand Down