diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-09 11:47:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-09 11:47:27 -0400 |
| commit | fd4d34295b36c5d9a1aba3d3f2764d721db093be (patch) | |
| tree | 8fc6069c00b156519c78fc3644a7eed4105a7bab /net | |
| parent | 4d11eff66889e65e9351111b1cc39f066f9f9729 (diff) | |
| parent | 52ea3a56a3268bc2a5a7c75e98c81463004e38ef (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
cls_cgroup: Fix oops when user send improperly 'tc filter add' request
r8169: fix crash when large packets are received
Diffstat (limited to 'net')
| -rw-r--r-- | net/sched/cls_cgroup.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c index cc29b44b1500..e5becb92b3e7 100644 --- a/net/sched/cls_cgroup.c +++ b/net/sched/cls_cgroup.c | |||
| @@ -167,6 +167,9 @@ static int cls_cgroup_change(struct tcf_proto *tp, unsigned long base, | |||
| 167 | struct tcf_exts e; | 167 | struct tcf_exts e; |
| 168 | int err; | 168 | int err; |
| 169 | 169 | ||
| 170 | if (!tca[TCA_OPTIONS]) | ||
| 171 | return -EINVAL; | ||
| 172 | |||
| 170 | if (head == NULL) { | 173 | if (head == NULL) { |
| 171 | if (!handle) | 174 | if (!handle) |
| 172 | return -EINVAL; | 175 | return -EINVAL; |