diff --git a/[refs] b/[refs] index 6c2b7422f08d..36fa2e3a12cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31bd06eb33bbabe643385a861d780d950ca73846 +refs/heads/master: 541673c859c0d71dedaaea1c148dfe3ccccc9422 diff --git a/trunk/net/sched/pedit.c b/trunk/net/sched/pedit.c index b5167afec2dc..1742a68e0122 100644 --- a/trunk/net/sched/pedit.c +++ b/trunk/net/sched/pedit.c @@ -245,10 +245,12 @@ tcf_pedit_dump(struct sk_buff *skb, struct tc_action *a,int bind, int ref) t.lastuse = jiffies_to_clock_t(jiffies - p->tm.lastuse); t.expires = jiffies_to_clock_t(p->tm.expires); RTA_PUT(skb, TCA_PEDIT_TM, sizeof(t), &t); + kfree(opt); return skb->len; rtattr_failure: skb_trim(skb, b - skb->data); + kfree(opt); return -1; }