lkml.org 
[lkml]   [2016]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.3 101/157] sched,cls_flower: set key address type when present
    Date
    4.3-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jamal Hadi Salim <jhs@mojatatu.com>

    [ Upstream commit 66530bdf85eb1d72a0c399665e09a2c2298501c6 ]

    only when user space passes the addresses should we consider their
    presence

    Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
    Acked-by: Jiri Pirko <jiri@resnulli.us>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/sched/cls_flower.c | 10 ++++++++--
    1 file changed, 8 insertions(+), 2 deletions(-)

    --- a/net/sched/cls_flower.c
    +++ b/net/sched/cls_flower.c
    @@ -252,23 +252,28 @@ static int fl_set_key(struct net *net, s
    fl_set_key_val(tb, key->eth.src, TCA_FLOWER_KEY_ETH_SRC,
    mask->eth.src, TCA_FLOWER_KEY_ETH_SRC_MASK,
    sizeof(key->eth.src));
    +
    fl_set_key_val(tb, &key->basic.n_proto, TCA_FLOWER_KEY_ETH_TYPE,
    &mask->basic.n_proto, TCA_FLOWER_UNSPEC,
    sizeof(key->basic.n_proto));
    +
    if (key->basic.n_proto == htons(ETH_P_IP) ||
    key->basic.n_proto == htons(ETH_P_IPV6)) {
    fl_set_key_val(tb, &key->basic.ip_proto, TCA_FLOWER_KEY_IP_PROTO,
    &mask->basic.ip_proto, TCA_FLOWER_UNSPEC,
    sizeof(key->basic.ip_proto));
    }
    - if (key->control.addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS) {
    +
    + if (tb[TCA_FLOWER_KEY_IPV4_SRC] || tb[TCA_FLOWER_KEY_IPV4_DST]) {
    + key->control.addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;
    fl_set_key_val(tb, &key->ipv4.src, TCA_FLOWER_KEY_IPV4_SRC,
    &mask->ipv4.src, TCA_FLOWER_KEY_IPV4_SRC_MASK,
    sizeof(key->ipv4.src));
    fl_set_key_val(tb, &key->ipv4.dst, TCA_FLOWER_KEY_IPV4_DST,
    &mask->ipv4.dst, TCA_FLOWER_KEY_IPV4_DST_MASK,
    sizeof(key->ipv4.dst));
    - } else if (key->control.addr_type == FLOW_DISSECTOR_KEY_IPV6_ADDRS) {
    + } else if (tb[TCA_FLOWER_KEY_IPV6_SRC] || tb[TCA_FLOWER_KEY_IPV6_DST]) {
    + key->control.addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS;
    fl_set_key_val(tb, &key->ipv6.src, TCA_FLOWER_KEY_IPV6_SRC,
    &mask->ipv6.src, TCA_FLOWER_KEY_IPV6_SRC_MASK,
    sizeof(key->ipv6.src));
    @@ -276,6 +281,7 @@ static int fl_set_key(struct net *net, s
    &mask->ipv6.dst, TCA_FLOWER_KEY_IPV6_DST_MASK,
    sizeof(key->ipv6.dst));
    }
    +
    if (key->basic.ip_proto == IPPROTO_TCP) {
    fl_set_key_val(tb, &key->tp.src, TCA_FLOWER_KEY_TCP_SRC,
    &mask->tp.src, TCA_FLOWER_UNSPEC,

    \
     
     \ /
      Last update: 2016-01-27 20:01    [W:4.082 / U:0.608 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site