projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue
[platform/kernel/linux-rpi.git]
/
net
/
openvswitch
/
flow_netlink.c
diff --git
a/net/openvswitch/flow_netlink.c
b/net/openvswitch/flow_netlink.c
index
7176156
..
4c09cf8
100644
(file)
--- a/
net/openvswitch/flow_netlink.c
+++ b/
net/openvswitch/flow_netlink.c
@@
-2465,7
+2465,7
@@
static struct nlattr *reserve_sfa_size(struct sw_flow_actions **sfa,
new_acts_size = max(next_offset + req_size, ksize(*sfa) * 2);
if (new_acts_size > MAX_ACTIONS_BUFSIZE) {
new_acts_size = max(next_offset + req_size, ksize(*sfa) * 2);
if (new_acts_size > MAX_ACTIONS_BUFSIZE) {
- if ((
MAX_ACTIONS_BUFSIZE - next_offset) < req_size
) {
+ if ((
next_offset + req_size) > MAX_ACTIONS_BUFSIZE
) {
OVS_NLERR(log, "Flow action size exceeds max %u",
MAX_ACTIONS_BUFSIZE);
return ERR_PTR(-EMSGSIZE);
OVS_NLERR(log, "Flow action size exceeds max %u",
MAX_ACTIONS_BUFSIZE);
return ERR_PTR(-EMSGSIZE);