|
@@ -1535,6 +1535,7 @@ void ip_send_unicast_reply(struct net *net, struct sk_buff *skb,
|
|
|
struct sk_buff *nskb;
|
|
struct sk_buff *nskb;
|
|
|
struct sock *sk;
|
|
struct sock *sk;
|
|
|
struct inet_sock *inet;
|
|
struct inet_sock *inet;
|
|
|
|
|
+ int err;
|
|
|
|
|
|
|
|
if (__ip_options_echo(&replyopts.opt.opt, skb, sopt))
|
|
if (__ip_options_echo(&replyopts.opt.opt, skb, sopt))
|
|
|
return;
|
|
return;
|
|
@@ -1574,8 +1575,13 @@ void ip_send_unicast_reply(struct net *net, struct sk_buff *skb,
|
|
|
sock_net_set(sk, net);
|
|
sock_net_set(sk, net);
|
|
|
__skb_queue_head_init(&sk->sk_write_queue);
|
|
__skb_queue_head_init(&sk->sk_write_queue);
|
|
|
sk->sk_sndbuf = sysctl_wmem_default;
|
|
sk->sk_sndbuf = sysctl_wmem_default;
|
|
|
- ip_append_data(sk, &fl4, ip_reply_glue_bits, arg->iov->iov_base, len, 0,
|
|
|
|
|
- &ipc, &rt, MSG_DONTWAIT);
|
|
|
|
|
|
|
+ err = ip_append_data(sk, &fl4, ip_reply_glue_bits, arg->iov->iov_base,
|
|
|
|
|
+ len, 0, &ipc, &rt, MSG_DONTWAIT);
|
|
|
|
|
+ if (unlikely(err)) {
|
|
|
|
|
+ ip_flush_pending_frames(sk);
|
|
|
|
|
+ goto out;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
nskb = skb_peek(&sk->sk_write_queue);
|
|
nskb = skb_peek(&sk->sk_write_queue);
|
|
|
if (nskb) {
|
|
if (nskb) {
|
|
|
if (arg->csumoffset >= 0)
|
|
if (arg->csumoffset >= 0)
|
|
@@ -1587,7 +1593,7 @@ void ip_send_unicast_reply(struct net *net, struct sk_buff *skb,
|
|
|
skb_set_queue_mapping(nskb, skb_get_queue_mapping(skb));
|
|
skb_set_queue_mapping(nskb, skb_get_queue_mapping(skb));
|
|
|
ip_push_pending_frames(sk, &fl4);
|
|
ip_push_pending_frames(sk, &fl4);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+out:
|
|
|
put_cpu_var(unicast_sock);
|
|
put_cpu_var(unicast_sock);
|
|
|
|
|
|
|
|
ip_rt_put(rt);
|
|
ip_rt_put(rt);
|