summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2015-06-15 15:29:06 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2015-06-17 07:52:16 +0200
commit23c1e105b554384f16ae6b6b29a1296183254620 (patch)
treea7b756f72c6a5b09827d81a5b10282bb38ac7b0b
parent45204ebce7219dc786de5b07b0341360321177a7 (diff)
downloadbarebox-23c1e105b554384f16ae6b6b29a1296183254620.tar.gz
barebox-23c1e105b554384f16ae6b6b29a1296183254620.tar.xz
state: uint8: add range check for uint8
Bail out, if the user tries to set a value > 255. Cc: Jan Luebbe <jluebbe@debian.org> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--common/state.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/common/state.c b/common/state.c
index e30f726607..8fa027a847 100644
--- a/common/state.c
+++ b/common/state.c
@@ -113,6 +113,7 @@ static int state_set_dirty(struct param_d *p, void *priv)
struct state_uint32 {
struct state_variable var;
struct param_d *param;
+ struct state *state;
uint32_t value;
uint32_t value_default;
};
@@ -163,6 +164,17 @@ static int state_uint32_import(struct state_variable *sv,
return 0;
}
+static int state_uint8_set(struct param_d *p, void *priv)
+{
+ struct state_uint32 *su32 = priv;
+ struct state *state = su32->state;
+
+ if (su32->value > 255)
+ return -ERANGE;
+
+ return state_set_dirty(p, state);
+}
+
static struct state_variable *state_uint8_create(struct state *state,
const char *name, struct device_node *node)
{
@@ -171,8 +183,8 @@ static struct state_variable *state_uint8_create(struct state *state,
su32 = xzalloc(sizeof(*su32));
- param = dev_add_param_int(&state->dev, name, state_set_dirty,
- NULL, &su32->value, "%u", state);
+ param = dev_add_param_int(&state->dev, name, state_uint8_set,
+ NULL, &su32->value, "%u", su32);
if (IS_ERR(param)) {
free(su32);
return ERR_CAST(param);
@@ -185,6 +197,7 @@ static struct state_variable *state_uint8_create(struct state *state,
#else
su32->var.raw = &su32->value + 3;
#endif
+ su32->state = state;
return &su32->var;
}