net: Remove FLOWI_FLAG_CAN_SLEEP
FLOWI_FLAG_CAN_SLEEP was used to notify xfrm about the posibility to sleep until the needed states are resolved. This code is gone, so FLOWI_FLAG_CAN_SLEEP is not needed anymore. Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
This commit is contained in:
@@ -20,8 +20,7 @@ struct flowi_common {
|
|||||||
__u8 flowic_proto;
|
__u8 flowic_proto;
|
||||||
__u8 flowic_flags;
|
__u8 flowic_flags;
|
||||||
#define FLOWI_FLAG_ANYSRC 0x01
|
#define FLOWI_FLAG_ANYSRC 0x01
|
||||||
#define FLOWI_FLAG_CAN_SLEEP 0x02
|
#define FLOWI_FLAG_KNOWN_NH 0x02
|
||||||
#define FLOWI_FLAG_KNOWN_NH 0x04
|
|
||||||
__u32 flowic_secid;
|
__u32 flowic_secid;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -711,11 +711,9 @@ void ip6_flush_pending_frames(struct sock *sk);
|
|||||||
|
|
||||||
int ip6_dst_lookup(struct sock *sk, struct dst_entry **dst, struct flowi6 *fl6);
|
int ip6_dst_lookup(struct sock *sk, struct dst_entry **dst, struct flowi6 *fl6);
|
||||||
struct dst_entry *ip6_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6,
|
struct dst_entry *ip6_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6,
|
||||||
const struct in6_addr *final_dst,
|
const struct in6_addr *final_dst);
|
||||||
bool can_sleep);
|
|
||||||
struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6,
|
struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6,
|
||||||
const struct in6_addr *final_dst,
|
const struct in6_addr *final_dst);
|
||||||
bool can_sleep);
|
|
||||||
struct dst_entry *ip6_blackhole_route(struct net *net,
|
struct dst_entry *ip6_blackhole_route(struct net *net,
|
||||||
struct dst_entry *orig_dst);
|
struct dst_entry *orig_dst);
|
||||||
|
|
||||||
|
|||||||
@@ -239,14 +239,12 @@ static inline char rt_tos2priority(u8 tos)
|
|||||||
static inline void ip_route_connect_init(struct flowi4 *fl4, __be32 dst, __be32 src,
|
static inline void ip_route_connect_init(struct flowi4 *fl4, __be32 dst, __be32 src,
|
||||||
u32 tos, int oif, u8 protocol,
|
u32 tos, int oif, u8 protocol,
|
||||||
__be16 sport, __be16 dport,
|
__be16 sport, __be16 dport,
|
||||||
struct sock *sk, bool can_sleep)
|
struct sock *sk)
|
||||||
{
|
{
|
||||||
__u8 flow_flags = 0;
|
__u8 flow_flags = 0;
|
||||||
|
|
||||||
if (inet_sk(sk)->transparent)
|
if (inet_sk(sk)->transparent)
|
||||||
flow_flags |= FLOWI_FLAG_ANYSRC;
|
flow_flags |= FLOWI_FLAG_ANYSRC;
|
||||||
if (can_sleep)
|
|
||||||
flow_flags |= FLOWI_FLAG_CAN_SLEEP;
|
|
||||||
|
|
||||||
flowi4_init_output(fl4, oif, sk->sk_mark, tos, RT_SCOPE_UNIVERSE,
|
flowi4_init_output(fl4, oif, sk->sk_mark, tos, RT_SCOPE_UNIVERSE,
|
||||||
protocol, flow_flags, dst, src, dport, sport);
|
protocol, flow_flags, dst, src, dport, sport);
|
||||||
@@ -256,13 +254,13 @@ static inline struct rtable *ip_route_connect(struct flowi4 *fl4,
|
|||||||
__be32 dst, __be32 src, u32 tos,
|
__be32 dst, __be32 src, u32 tos,
|
||||||
int oif, u8 protocol,
|
int oif, u8 protocol,
|
||||||
__be16 sport, __be16 dport,
|
__be16 sport, __be16 dport,
|
||||||
struct sock *sk, bool can_sleep)
|
struct sock *sk)
|
||||||
{
|
{
|
||||||
struct net *net = sock_net(sk);
|
struct net *net = sock_net(sk);
|
||||||
struct rtable *rt;
|
struct rtable *rt;
|
||||||
|
|
||||||
ip_route_connect_init(fl4, dst, src, tos, oif, protocol,
|
ip_route_connect_init(fl4, dst, src, tos, oif, protocol,
|
||||||
sport, dport, sk, can_sleep);
|
sport, dport, sk);
|
||||||
|
|
||||||
if (!dst || !src) {
|
if (!dst || !src) {
|
||||||
rt = __ip_route_output_key(net, fl4);
|
rt = __ip_route_output_key(net, fl4);
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
|||||||
rt = ip_route_connect(fl4, nexthop, inet->inet_saddr,
|
rt = ip_route_connect(fl4, nexthop, inet->inet_saddr,
|
||||||
RT_CONN_FLAGS(sk), sk->sk_bound_dev_if,
|
RT_CONN_FLAGS(sk), sk->sk_bound_dev_if,
|
||||||
IPPROTO_DCCP,
|
IPPROTO_DCCP,
|
||||||
orig_sport, orig_dport, sk, true);
|
orig_sport, orig_dport, sk);
|
||||||
if (IS_ERR(rt))
|
if (IS_ERR(rt))
|
||||||
return PTR_ERR(rt);
|
return PTR_ERR(rt);
|
||||||
|
|
||||||
|
|||||||
@@ -237,7 +237,7 @@ static int dccp_v6_send_response(struct sock *sk, struct request_sock *req)
|
|||||||
|
|
||||||
final_p = fl6_update_dst(&fl6, np->opt, &final);
|
final_p = fl6_update_dst(&fl6, np->opt, &final);
|
||||||
|
|
||||||
dst = ip6_dst_lookup_flow(sk, &fl6, final_p, false);
|
dst = ip6_dst_lookup_flow(sk, &fl6, final_p);
|
||||||
if (IS_ERR(dst)) {
|
if (IS_ERR(dst)) {
|
||||||
err = PTR_ERR(dst);
|
err = PTR_ERR(dst);
|
||||||
dst = NULL;
|
dst = NULL;
|
||||||
@@ -301,7 +301,7 @@ static void dccp_v6_ctl_send_reset(struct sock *sk, struct sk_buff *rxskb)
|
|||||||
security_skb_classify_flow(rxskb, flowi6_to_flowi(&fl6));
|
security_skb_classify_flow(rxskb, flowi6_to_flowi(&fl6));
|
||||||
|
|
||||||
/* sk = NULL, but it is safe for now. RST socket required. */
|
/* sk = NULL, but it is safe for now. RST socket required. */
|
||||||
dst = ip6_dst_lookup_flow(ctl_sk, &fl6, NULL, false);
|
dst = ip6_dst_lookup_flow(ctl_sk, &fl6, NULL);
|
||||||
if (!IS_ERR(dst)) {
|
if (!IS_ERR(dst)) {
|
||||||
skb_dst_set(skb, dst);
|
skb_dst_set(skb, dst);
|
||||||
ip6_xmit(ctl_sk, skb, &fl6, NULL, 0);
|
ip6_xmit(ctl_sk, skb, &fl6, NULL, 0);
|
||||||
@@ -512,7 +512,7 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk,
|
|||||||
fl6.fl6_sport = htons(ireq->ir_num);
|
fl6.fl6_sport = htons(ireq->ir_num);
|
||||||
security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
|
security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
|
||||||
|
|
||||||
dst = ip6_dst_lookup_flow(sk, &fl6, final_p, false);
|
dst = ip6_dst_lookup_flow(sk, &fl6, final_p);
|
||||||
if (IS_ERR(dst))
|
if (IS_ERR(dst))
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
@@ -932,7 +932,7 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
|
|||||||
|
|
||||||
final_p = fl6_update_dst(&fl6, np->opt, &final);
|
final_p = fl6_update_dst(&fl6, np->opt, &final);
|
||||||
|
|
||||||
dst = ip6_dst_lookup_flow(sk, &fl6, final_p, true);
|
dst = ip6_dst_lookup_flow(sk, &fl6, final_p);
|
||||||
if (IS_ERR(dst)) {
|
if (IS_ERR(dst)) {
|
||||||
err = PTR_ERR(dst);
|
err = PTR_ERR(dst);
|
||||||
goto failure;
|
goto failure;
|
||||||
|
|||||||
@@ -1288,8 +1288,6 @@ int dn_route_output_sock(struct dst_entry __rcu **pprt, struct flowidn *fl, stru
|
|||||||
|
|
||||||
err = __dn_route_output_key(pprt, fl, flags & MSG_TRYHARD);
|
err = __dn_route_output_key(pprt, fl, flags & MSG_TRYHARD);
|
||||||
if (err == 0 && fl->flowidn_proto) {
|
if (err == 0 && fl->flowidn_proto) {
|
||||||
if (!(flags & MSG_DONTWAIT))
|
|
||||||
fl->flowidn_flags |= FLOWI_FLAG_CAN_SLEEP;
|
|
||||||
*pprt = xfrm_lookup(&init_net, *pprt,
|
*pprt = xfrm_lookup(&init_net, *pprt,
|
||||||
flowidn_to_flowi(fl), sk, 0);
|
flowidn_to_flowi(fl), sk, 0);
|
||||||
if (IS_ERR(*pprt)) {
|
if (IS_ERR(*pprt)) {
|
||||||
|
|||||||
@@ -1133,7 +1133,7 @@ static int inet_sk_reselect_saddr(struct sock *sk)
|
|||||||
fl4 = &inet->cork.fl.u.ip4;
|
fl4 = &inet->cork.fl.u.ip4;
|
||||||
rt = ip_route_connect(fl4, daddr, 0, RT_CONN_FLAGS(sk),
|
rt = ip_route_connect(fl4, daddr, 0, RT_CONN_FLAGS(sk),
|
||||||
sk->sk_bound_dev_if, sk->sk_protocol,
|
sk->sk_bound_dev_if, sk->sk_protocol,
|
||||||
inet->inet_sport, inet->inet_dport, sk, false);
|
inet->inet_sport, inet->inet_dport, sk);
|
||||||
if (IS_ERR(rt))
|
if (IS_ERR(rt))
|
||||||
return PTR_ERR(rt);
|
return PTR_ERR(rt);
|
||||||
|
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
|||||||
rt = ip_route_connect(fl4, usin->sin_addr.s_addr, saddr,
|
rt = ip_route_connect(fl4, usin->sin_addr.s_addr, saddr,
|
||||||
RT_CONN_FLAGS(sk), oif,
|
RT_CONN_FLAGS(sk), oif,
|
||||||
sk->sk_protocol,
|
sk->sk_protocol,
|
||||||
inet->inet_sport, usin->sin_port, sk, true);
|
inet->inet_sport, usin->sin_port, sk);
|
||||||
if (IS_ERR(rt)) {
|
if (IS_ERR(rt)) {
|
||||||
err = PTR_ERR(rt);
|
err = PTR_ERR(rt);
|
||||||
if (err == -ENETUNREACH)
|
if (err == -ENETUNREACH)
|
||||||
|
|||||||
@@ -575,7 +575,7 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
|
|||||||
flowi4_init_output(&fl4, ipc.oif, sk->sk_mark, tos,
|
flowi4_init_output(&fl4, ipc.oif, sk->sk_mark, tos,
|
||||||
RT_SCOPE_UNIVERSE,
|
RT_SCOPE_UNIVERSE,
|
||||||
inet->hdrincl ? IPPROTO_RAW : sk->sk_protocol,
|
inet->hdrincl ? IPPROTO_RAW : sk->sk_protocol,
|
||||||
inet_sk_flowi_flags(sk) | FLOWI_FLAG_CAN_SLEEP |
|
inet_sk_flowi_flags(sk) |
|
||||||
(inet->hdrincl ? FLOWI_FLAG_KNOWN_NH : 0),
|
(inet->hdrincl ? FLOWI_FLAG_KNOWN_NH : 0),
|
||||||
daddr, saddr, 0, 0);
|
daddr, saddr, 0, 0);
|
||||||
|
|
||||||
|
|||||||
@@ -173,7 +173,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
|||||||
rt = ip_route_connect(fl4, nexthop, inet->inet_saddr,
|
rt = ip_route_connect(fl4, nexthop, inet->inet_saddr,
|
||||||
RT_CONN_FLAGS(sk), sk->sk_bound_dev_if,
|
RT_CONN_FLAGS(sk), sk->sk_bound_dev_if,
|
||||||
IPPROTO_TCP,
|
IPPROTO_TCP,
|
||||||
orig_sport, orig_dport, sk, true);
|
orig_sport, orig_dport, sk);
|
||||||
if (IS_ERR(rt)) {
|
if (IS_ERR(rt)) {
|
||||||
err = PTR_ERR(rt);
|
err = PTR_ERR(rt);
|
||||||
if (err == -ENETUNREACH)
|
if (err == -ENETUNREACH)
|
||||||
|
|||||||
@@ -990,7 +990,7 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
|
|||||||
fl4 = &fl4_stack;
|
fl4 = &fl4_stack;
|
||||||
flowi4_init_output(fl4, ipc.oif, sk->sk_mark, tos,
|
flowi4_init_output(fl4, ipc.oif, sk->sk_mark, tos,
|
||||||
RT_SCOPE_UNIVERSE, sk->sk_protocol,
|
RT_SCOPE_UNIVERSE, sk->sk_protocol,
|
||||||
inet_sk_flowi_flags(sk)|FLOWI_FLAG_CAN_SLEEP,
|
inet_sk_flowi_flags(sk),
|
||||||
faddr, saddr, dport, inet->inet_sport);
|
faddr, saddr, dport, inet->inet_sport);
|
||||||
|
|
||||||
security_sk_classify_flow(sk, flowi4_to_flowi(fl4));
|
security_sk_classify_flow(sk, flowi4_to_flowi(fl4));
|
||||||
|
|||||||
@@ -661,7 +661,7 @@ int inet6_sk_rebuild_header(struct sock *sk)
|
|||||||
|
|
||||||
final_p = fl6_update_dst(&fl6, np->opt, &final);
|
final_p = fl6_update_dst(&fl6, np->opt, &final);
|
||||||
|
|
||||||
dst = ip6_dst_lookup_flow(sk, &fl6, final_p, false);
|
dst = ip6_dst_lookup_flow(sk, &fl6, final_p);
|
||||||
if (IS_ERR(dst)) {
|
if (IS_ERR(dst)) {
|
||||||
sk->sk_route_caps = 0;
|
sk->sk_route_caps = 0;
|
||||||
sk->sk_err_soft = -PTR_ERR(dst);
|
sk->sk_err_soft = -PTR_ERR(dst);
|
||||||
|
|||||||
@@ -171,7 +171,7 @@ ipv4_connected:
|
|||||||
opt = flowlabel ? flowlabel->opt : np->opt;
|
opt = flowlabel ? flowlabel->opt : np->opt;
|
||||||
final_p = fl6_update_dst(&fl6, opt, &final);
|
final_p = fl6_update_dst(&fl6, opt, &final);
|
||||||
|
|
||||||
dst = ip6_dst_lookup_flow(sk, &fl6, final_p, true);
|
dst = ip6_dst_lookup_flow(sk, &fl6, final_p);
|
||||||
err = 0;
|
err = 0;
|
||||||
if (IS_ERR(dst)) {
|
if (IS_ERR(dst)) {
|
||||||
err = PTR_ERR(dst);
|
err = PTR_ERR(dst);
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ struct dst_entry *inet6_csk_route_req(struct sock *sk,
|
|||||||
fl6->fl6_sport = htons(ireq->ir_num);
|
fl6->fl6_sport = htons(ireq->ir_num);
|
||||||
security_req_classify_flow(req, flowi6_to_flowi(fl6));
|
security_req_classify_flow(req, flowi6_to_flowi(fl6));
|
||||||
|
|
||||||
dst = ip6_dst_lookup_flow(sk, fl6, final_p, false);
|
dst = ip6_dst_lookup_flow(sk, fl6, final_p);
|
||||||
if (IS_ERR(dst))
|
if (IS_ERR(dst))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
@@ -216,7 +216,7 @@ static struct dst_entry *inet6_csk_route_socket(struct sock *sk,
|
|||||||
|
|
||||||
dst = __inet6_csk_dst_check(sk, np->dst_cookie);
|
dst = __inet6_csk_dst_check(sk, np->dst_cookie);
|
||||||
if (!dst) {
|
if (!dst) {
|
||||||
dst = ip6_dst_lookup_flow(sk, fl6, final_p, false);
|
dst = ip6_dst_lookup_flow(sk, fl6, final_p);
|
||||||
|
|
||||||
if (!IS_ERR(dst))
|
if (!IS_ERR(dst))
|
||||||
__inet6_csk_dst_store(sk, dst, NULL, NULL);
|
__inet6_csk_dst_store(sk, dst, NULL, NULL);
|
||||||
|
|||||||
@@ -938,7 +938,6 @@ EXPORT_SYMBOL_GPL(ip6_dst_lookup);
|
|||||||
* @sk: socket which provides route info
|
* @sk: socket which provides route info
|
||||||
* @fl6: flow to lookup
|
* @fl6: flow to lookup
|
||||||
* @final_dst: final destination address for ipsec lookup
|
* @final_dst: final destination address for ipsec lookup
|
||||||
* @can_sleep: we are in a sleepable context
|
|
||||||
*
|
*
|
||||||
* This function performs a route lookup on the given flow.
|
* This function performs a route lookup on the given flow.
|
||||||
*
|
*
|
||||||
@@ -946,8 +945,7 @@ EXPORT_SYMBOL_GPL(ip6_dst_lookup);
|
|||||||
* error code.
|
* error code.
|
||||||
*/
|
*/
|
||||||
struct dst_entry *ip6_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6,
|
struct dst_entry *ip6_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6,
|
||||||
const struct in6_addr *final_dst,
|
const struct in6_addr *final_dst)
|
||||||
bool can_sleep)
|
|
||||||
{
|
{
|
||||||
struct dst_entry *dst = NULL;
|
struct dst_entry *dst = NULL;
|
||||||
int err;
|
int err;
|
||||||
@@ -957,8 +955,6 @@ struct dst_entry *ip6_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6,
|
|||||||
return ERR_PTR(err);
|
return ERR_PTR(err);
|
||||||
if (final_dst)
|
if (final_dst)
|
||||||
fl6->daddr = *final_dst;
|
fl6->daddr = *final_dst;
|
||||||
if (can_sleep)
|
|
||||||
fl6->flowi6_flags |= FLOWI_FLAG_CAN_SLEEP;
|
|
||||||
|
|
||||||
return xfrm_lookup(sock_net(sk), dst, flowi6_to_flowi(fl6), sk, 0);
|
return xfrm_lookup(sock_net(sk), dst, flowi6_to_flowi(fl6), sk, 0);
|
||||||
}
|
}
|
||||||
@@ -969,7 +965,6 @@ EXPORT_SYMBOL_GPL(ip6_dst_lookup_flow);
|
|||||||
* @sk: socket which provides the dst cache and route info
|
* @sk: socket which provides the dst cache and route info
|
||||||
* @fl6: flow to lookup
|
* @fl6: flow to lookup
|
||||||
* @final_dst: final destination address for ipsec lookup
|
* @final_dst: final destination address for ipsec lookup
|
||||||
* @can_sleep: we are in a sleepable context
|
|
||||||
*
|
*
|
||||||
* This function performs a route lookup on the given flow with the
|
* This function performs a route lookup on the given flow with the
|
||||||
* possibility of using the cached route in the socket if it is valid.
|
* possibility of using the cached route in the socket if it is valid.
|
||||||
@@ -980,8 +975,7 @@ EXPORT_SYMBOL_GPL(ip6_dst_lookup_flow);
|
|||||||
* error code.
|
* error code.
|
||||||
*/
|
*/
|
||||||
struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6,
|
struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6,
|
||||||
const struct in6_addr *final_dst,
|
const struct in6_addr *final_dst)
|
||||||
bool can_sleep)
|
|
||||||
{
|
{
|
||||||
struct dst_entry *dst = sk_dst_check(sk, inet6_sk(sk)->dst_cookie);
|
struct dst_entry *dst = sk_dst_check(sk, inet6_sk(sk)->dst_cookie);
|
||||||
int err;
|
int err;
|
||||||
@@ -993,8 +987,6 @@ struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6,
|
|||||||
return ERR_PTR(err);
|
return ERR_PTR(err);
|
||||||
if (final_dst)
|
if (final_dst)
|
||||||
fl6->daddr = *final_dst;
|
fl6->daddr = *final_dst;
|
||||||
if (can_sleep)
|
|
||||||
fl6->flowi6_flags |= FLOWI_FLAG_CAN_SLEEP;
|
|
||||||
|
|
||||||
return xfrm_lookup(sock_net(sk), dst, flowi6_to_flowi(fl6), sk, 0);
|
return xfrm_lookup(sock_net(sk), dst, flowi6_to_flowi(fl6), sk, 0);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -145,7 +145,7 @@ int ping_v6_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
|
|||||||
else if (!fl6.flowi6_oif)
|
else if (!fl6.flowi6_oif)
|
||||||
fl6.flowi6_oif = np->ucast_oif;
|
fl6.flowi6_oif = np->ucast_oif;
|
||||||
|
|
||||||
dst = ip6_sk_dst_lookup_flow(sk, &fl6, daddr, 1);
|
dst = ip6_sk_dst_lookup_flow(sk, &fl6, daddr);
|
||||||
if (IS_ERR(dst))
|
if (IS_ERR(dst))
|
||||||
return PTR_ERR(dst);
|
return PTR_ERR(dst);
|
||||||
rt = (struct rt6_info *) dst;
|
rt = (struct rt6_info *) dst;
|
||||||
|
|||||||
@@ -865,7 +865,7 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk,
|
|||||||
fl6.flowi6_oif = np->ucast_oif;
|
fl6.flowi6_oif = np->ucast_oif;
|
||||||
security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
|
security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
|
||||||
|
|
||||||
dst = ip6_dst_lookup_flow(sk, &fl6, final_p, true);
|
dst = ip6_dst_lookup_flow(sk, &fl6, final_p);
|
||||||
if (IS_ERR(dst)) {
|
if (IS_ERR(dst)) {
|
||||||
err = PTR_ERR(dst);
|
err = PTR_ERR(dst);
|
||||||
goto out;
|
goto out;
|
||||||
|
|||||||
@@ -247,7 +247,7 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb)
|
|||||||
fl6.fl6_sport = inet_sk(sk)->inet_sport;
|
fl6.fl6_sport = inet_sk(sk)->inet_sport;
|
||||||
security_req_classify_flow(req, flowi6_to_flowi(&fl6));
|
security_req_classify_flow(req, flowi6_to_flowi(&fl6));
|
||||||
|
|
||||||
dst = ip6_dst_lookup_flow(sk, &fl6, final_p, false);
|
dst = ip6_dst_lookup_flow(sk, &fl6, final_p);
|
||||||
if (IS_ERR(dst))
|
if (IS_ERR(dst))
|
||||||
goto out_free;
|
goto out_free;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -258,7 +258,7 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
|
|||||||
|
|
||||||
security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
|
security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
|
||||||
|
|
||||||
dst = ip6_dst_lookup_flow(sk, &fl6, final_p, true);
|
dst = ip6_dst_lookup_flow(sk, &fl6, final_p);
|
||||||
if (IS_ERR(dst)) {
|
if (IS_ERR(dst)) {
|
||||||
err = PTR_ERR(dst);
|
err = PTR_ERR(dst);
|
||||||
goto failure;
|
goto failure;
|
||||||
@@ -801,7 +801,7 @@ static void tcp_v6_send_response(struct sk_buff *skb, u32 seq, u32 ack, u32 win,
|
|||||||
* Underlying function will use this to retrieve the network
|
* Underlying function will use this to retrieve the network
|
||||||
* namespace
|
* namespace
|
||||||
*/
|
*/
|
||||||
dst = ip6_dst_lookup_flow(ctl_sk, &fl6, NULL, false);
|
dst = ip6_dst_lookup_flow(ctl_sk, &fl6, NULL);
|
||||||
if (!IS_ERR(dst)) {
|
if (!IS_ERR(dst)) {
|
||||||
skb_dst_set(buff, dst);
|
skb_dst_set(buff, dst);
|
||||||
ip6_xmit(ctl_sk, buff, &fl6, NULL, tclass);
|
ip6_xmit(ctl_sk, buff, &fl6, NULL, tclass);
|
||||||
|
|||||||
@@ -1221,7 +1221,7 @@ do_udp_sendmsg:
|
|||||||
|
|
||||||
security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
|
security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
|
||||||
|
|
||||||
dst = ip6_sk_dst_lookup_flow(sk, &fl6, final_p, true);
|
dst = ip6_sk_dst_lookup_flow(sk, &fl6, final_p);
|
||||||
if (IS_ERR(dst)) {
|
if (IS_ERR(dst)) {
|
||||||
err = PTR_ERR(dst);
|
err = PTR_ERR(dst);
|
||||||
dst = NULL;
|
dst = NULL;
|
||||||
|
|||||||
@@ -598,7 +598,7 @@ static int l2tp_ip6_sendmsg(struct kiocb *iocb, struct sock *sk,
|
|||||||
|
|
||||||
security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
|
security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
|
||||||
|
|
||||||
dst = ip6_dst_lookup_flow(sk, &fl6, final_p, true);
|
dst = ip6_dst_lookup_flow(sk, &fl6, final_p);
|
||||||
if (IS_ERR(dst)) {
|
if (IS_ERR(dst)) {
|
||||||
err = PTR_ERR(dst);
|
err = PTR_ERR(dst);
|
||||||
goto out;
|
goto out;
|
||||||
|
|||||||
@@ -263,7 +263,7 @@ static void sctp_v6_get_dst(struct sctp_transport *t, union sctp_addr *saddr,
|
|||||||
}
|
}
|
||||||
|
|
||||||
final_p = fl6_update_dst(fl6, np->opt, &final);
|
final_p = fl6_update_dst(fl6, np->opt, &final);
|
||||||
dst = ip6_dst_lookup_flow(sk, fl6, final_p, false);
|
dst = ip6_dst_lookup_flow(sk, fl6, final_p);
|
||||||
if (!asoc || saddr)
|
if (!asoc || saddr)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
@@ -322,7 +322,7 @@ static void sctp_v6_get_dst(struct sctp_transport *t, union sctp_addr *saddr,
|
|||||||
fl6->saddr = baddr->v6.sin6_addr;
|
fl6->saddr = baddr->v6.sin6_addr;
|
||||||
fl6->fl6_sport = baddr->v6.sin6_port;
|
fl6->fl6_sport = baddr->v6.sin6_port;
|
||||||
final_p = fl6_update_dst(fl6, np->opt, &final);
|
final_p = fl6_update_dst(fl6, np->opt, &final);
|
||||||
dst = ip6_dst_lookup_flow(sk, fl6, final_p, false);
|
dst = ip6_dst_lookup_flow(sk, fl6, final_p);
|
||||||
}
|
}
|
||||||
|
|
||||||
out:
|
out:
|
||||||
|
|||||||
Reference in New Issue
Block a user