From 9b22168fc03c27267e9f9ff404ce0ca9a8da203f Mon Sep 17 00:00:00 2001 From: stephen hemminger Date: Fri, 23 Dec 2011 09:16:30 +0000 Subject: [PATCH] --- yaml --- r: 279055 b: refs/heads/master c: 2494654d4890316e7340fb8b3458daad0474a1b9 h: refs/heads/master i: 279053: 0410f4a5a40f6ad33da88d03aa24660e9e0018b7 279051: 2e06ab25f6e6160516ef1ff80262591649600290 279047: 341372890d903523a0c13a0888053242f157e3f6 279039: f9579729c9473f0eafa640c9380f8dc93cb61284 v: v3 --- [refs] | 2 +- trunk/net/sched/sch_netem.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d5b33e19e18d..7ca957b7b157 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5a59b73321d9c6e6a9f0be4c8b563668f12c625 +refs/heads/master: 2494654d4890316e7340fb8b3458daad0474a1b9 diff --git a/trunk/net/sched/sch_netem.c b/trunk/net/sched/sch_netem.c index 1fa2f903d221..ffcaa5975947 100644 --- a/trunk/net/sched/sch_netem.c +++ b/trunk/net/sched/sch_netem.c @@ -605,7 +605,7 @@ static int get_loss_clg(struct Qdisc *sch, const struct nlattr *attr) case NETEM_LOSS_GI: { const struct tc_netem_gimodel *gi = nla_data(la); - if (nla_len(la) != sizeof(struct tc_netem_gimodel)) { + if (nla_len(la) < sizeof(struct tc_netem_gimodel)) { pr_info("netem: incorrect gi model size\n"); return -EINVAL; } @@ -624,8 +624,8 @@ static int get_loss_clg(struct Qdisc *sch, const struct nlattr *attr) case NETEM_LOSS_GE: { const struct tc_netem_gemodel *ge = nla_data(la); - if (nla_len(la) != sizeof(struct tc_netem_gemodel)) { - pr_info("netem: incorrect gi model size\n"); + if (nla_len(la) < sizeof(struct tc_netem_gemodel)) { + pr_info("netem: incorrect ge model size\n"); return -EINVAL; }