projects / pve-kernel.git / blame
| Commit | Line | Data |
|---|---|---|
| 29e62dc0 FG |
1 | From 45f4251eac81036e2532b16d13f1ad421813eca9 Mon Sep 17 00:00:00 2001 |
| 2 | From: Wolfgang Bumiller <w.bumiller@proxmox.com> | |
| 3 | Date: Thu, 13 Apr 2017 10:13:31 +0200 | |
| 4 | Subject: [Zesty][PATCH 1/2] UBUNTU: SAUCE: net sched actions: fix access to uninitialized data | |
| 5 | MIME-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ||
| 9 | https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1682368 | |
| 10 | ||
| 11 | Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com> | |
| 12 | (cherry-picked from http://marc.info/?l=linux-netdev&m=149200746116365 ) | |
| 13 | Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> | |
| 14 | --- | |
| 15 | net/sched/act_api.c | 2 +- | |
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 17 | ||
| 18 | diff --git a/net/sched/act_api.c b/net/sched/act_api.c | |
| 19 | index 501c42d..32f12f5 100644 | |
| 20 | --- a/net/sched/act_api.c | |
| 21 | +++ b/net/sched/act_api.c | |
| 22 | @@ -607,7 +607,7 @@ struct tc_action *tcf_action_init_1(struct net *net, struct nlattr *nla, | |
| 23 | if (err < 0) | |
| 24 | goto err_mod; | |
| 25 | ||
| 26 | - if (tb[TCA_ACT_COOKIE]) { | |
| 27 | + if (name == NULL && tb[TCA_ACT_COOKIE]) { | |
| 28 | int cklen = nla_len(tb[TCA_ACT_COOKIE]); | |
| 29 | ||
| 30 | if (cklen > TC_COOKIE_MAX_SIZE) { | |
| 31 | -- | |
| 32 | 2.1.4 | |
| 33 |