@@ -41,6 +41,7 @@ enum snet_ticket_mode {
SNET_TICKET_OFF = 0,
SNET_TICKET_FIX,
SNET_TICKET_EXTEND,
+ SNET_TICKET_INVALID,
};
/* genetlink commands */
@@ -42,6 +42,12 @@ static __init int snet_init(void)
snet_evh_size, snet_vdh_size, snet_verdict_delay,
snet_verdict_name(snet_verdict_policy));
+ if (snet_verdict_policy >= SNET_VERDICT_INVALID) {
+ printk(KERN_ERR "snet: bad snet_verdict_policy\n");
+ ret = -EINVAL;
+ goto event_failed;
+ }
+
ret = snet_event_init();
if (ret < 0)
goto event_failed;
@@ -165,6 +165,12 @@ int snet_event_init(void)
{
int err = 0, i = 0;
+ if (snet_evh_size == 0) {
+ printk(KERN_ERR "snet: bad snet_evh_size value\n");
+ err = -EINVAL;
+ goto out;
+ }
+
snet_evh = kzalloc(sizeof(struct list_head) * snet_evh_size,
GFP_KERNEL);
if (!snet_evh) {
@@ -363,25 +363,38 @@ out:
static int snet_nl_config(struct sk_buff *skb,
struct genl_info *info)
{
- int ret = -EINVAL;
+ int ret = 0;
atomic_set(&snet_nl_seq, info->snd_seq);
if (info->attrs[SNET_A_VERDICT_DELAY]) {
- snet_verdict_delay = nla_get_u32(info->attrs[SNET_A_VERDICT_DELAY]);
+ unsigned int new = nla_get_u32(info->attrs[SNET_A_VERDICT_DELAY]);
+ if (new == 0) {
+ ret = -EINVAL;
+ goto out;
+ }
+ snet_verdict_delay = new;
pr_debug("snet_nl_config: verdict_delay=%u\n", snet_verdict_delay);
- ret = 0;
}
if (info->attrs[SNET_A_TICKET_DELAY]) {
- snet_ticket_delay = nla_get_u32(info->attrs[SNET_A_TICKET_DELAY]);
+ unsigned int new = nla_get_u32(info->attrs[SNET_A_TICKET_DELAY]);
+ if (new == 0) {
+ ret = -EINVAL;
+ goto out;
+ }
+ snet_ticket_delay = new;
pr_debug("snet_nl_config: ticket_delay=%u\n", snet_ticket_delay);
- ret = 0;
}
if (info->attrs[SNET_A_TICKET_MODE]) {
- snet_ticket_mode = nla_get_u32(info->attrs[SNET_A_TICKET_MODE]);
+ unsigned int new = nla_get_u32(info->attrs[SNET_A_TICKET_MODE]);
+ if (new >= SNET_TICKET_INVALID) {
+ ret = -EINVAL;
+ goto out;
+ }
+ snet_ticket_mode = new;
pr_debug("snet_nl_config: ticket_mode=%u\n", snet_ticket_mode);
- ret = 0;
}
+out:
return ret;
}
@@ -158,6 +158,18 @@ int snet_ticket_init(void)
struct cred *cred = (struct cred *) current->real_cred;
struct snet_task_security *tsec = NULL;
+ if (snet_ticket_mode >= SNET_TICKET_INVALID) {
+ printk(KERN_ERR "snet: bad snet_ticket_mode\n");
+ return -EINVAL;
+ }
+
+ if ((snet_ticket_mode == SNET_TICKET_FIX ||
+ snet_ticket_mode == SNET_TICKET_EXTEND) &&
+ (snet_ticket_delay == 0)) {
+ printk(KERN_ERR "snet: bad snet_ticket_delay\n");
+ return -EINVAL;
+ }
+
tsec = kzalloc(sizeof(struct snet_task_security), GFP_KERNEL);
if (tsec == NULL)
return -ENOMEM;
@@ -156,6 +156,18 @@ int snet_verdict_init(void)
{
int err = 0, i = 0;
+ if (snet_vdh_size == 0) {
+ printk(KERN_ERR "snet: bad snet_vdh_size value\n");
+ err = -EINVAL;
+ goto out;
+ }
+
+ if (snet_verdict_delay == 0) {
+ printk(KERN_ERR "snet: bad snet_verdict_delay value\n");
+ err = -EINVAL;
+ goto out;
+ }
+
snet_vdh = kzalloc(sizeof(struct list_head) * snet_vdh_size,
GFP_KERNEL);
if (!snet_vdh) {