Unverified Commit a771ed36 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12192 netfilter: nft_flow_offload: reset dst in route object after setting up flow 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/G4TZXRFIJK64PA4QD4K5DIVAZMIVBI5J/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9Q8LQ 
 
Link:https://gitee.com/openeuler/kernel/pulls/12192

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 8330907b 4132259c

include/net/netfilter/nf_flow_table.h

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ nf_flow_table_offload_del_cb(struct nf_flowtable *flow_table, 
}



int flow_offload_route_init(struct flow_offload *flow,

			    const struct nf_flow_route *route);

			    struct nf_flow_route *route);



int flow_offload_add(struct nf_flowtable *flow_table, struct flow_offload *flow);

void flow_offload_refresh(struct nf_flowtable *flow_table,

net/netfilter/nf_flow_table_core.c

+13 −3
Original line number Diff line number Diff line
@@ -74,13 +74,23 @@ struct flow_offload *flow_offload_alloc(struct nf_conn *ct) 
}

EXPORT_SYMBOL_GPL(flow_offload_alloc);



static struct dst_entry *nft_route_dst_fetch(struct nf_flow_route *route,

					     enum flow_offload_tuple_dir dir)

{

	struct dst_entry *dst = route->tuple[dir].dst;



	route->tuple[dir].dst = NULL;



	return dst;

}



static int flow_offload_fill_route(struct flow_offload *flow,

				   const struct nf_flow_route *route,

				   struct nf_flow_route *route,

				   enum flow_offload_tuple_dir dir)

{

	struct flow_offload_tuple *flow_tuple = &flow->tuplehash[dir].tuple;

	struct dst_entry *other_dst = route->tuple[!dir].dst;

	struct dst_entry *dst = route->tuple[dir].dst;

	struct dst_entry *dst = nft_route_dst_fetch(route, dir);



	if (!dst_hold_safe(route->tuple[dir].dst))

		return -1;
@@ -101,7 +111,7 @@ static int flow_offload_fill_route(struct flow_offload *flow, 
}



int flow_offload_route_init(struct flow_offload *flow,

			    const struct nf_flow_route *route)

			    struct nf_flow_route *route)

{

	int err;