From: David S. Miller <davem@davemloft.net>
Date: Wed, 28 Jan 2015 00:59:56 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v4.0-rc1~133^2~118
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95f873f2fff96c592c5d863e2a39825bd8bf0500;p=thirdparty%2Fkernel%2Fstable.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	arch/arm/boot/dts/imx6sx-sdb.dts
	net/sched/cls_bpf.c

Two simple sets of overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

95f873f2fff96c592c5d863e2a39825bd8bf0500
diff --cc net/sched/cls_bpf.c
index 1029923f9e868,f59adf8a4cd78..5f3ee9e4b5bf5
--- a/net/sched/cls_bpf.c
+++ b/net/sched/cls_bpf.c
@@@ -179,7 -179,12 +179,12 @@@ static int cls_bpf_modify_existing(stru
  		goto errout;
  	}
  
 -	bpf_size = bpf_len * sizeof(*bpf_ops);
 +	bpf_size = bpf_num_ops * sizeof(*bpf_ops);
+ 	if (bpf_size != nla_len(tb[TCA_BPF_OPS])) {
+ 		ret = -EINVAL;
+ 		goto errout;
+ 	}
+ 
  	bpf_ops = kzalloc(bpf_size, GFP_KERNEL);
  	if (bpf_ops == NULL) {
  		ret = -ENOMEM;