[IPSEC]: return error when no dst in ah & esp output.

3577484e · James Morris · David S. Miller · b952a29d · 3577484e · 3577484e
Commit 3577484e authored Mar 19, 2003 by James Morris Committed by David S. Miller Mar 19, 2003
Show whitespace changes
Inline Side-by-side

Showing with 12 additions and 4 deletions

net/ipv4/ah.c net/ipv4/ah.c +3 -1

net/ipv4/esp.c net/ipv4/esp.c +3 -1

net/ipv6/ah6.c net/ipv6/ah6.c +3 -1

net/ipv6/esp6.c net/ipv6/esp6.c +3 -1

No files found.
--- a/net/ipv4/ah.c
+++ b/net/ipv4/ah.c
@@ -141,8 +141,10 @@ static int ah_output(struct sk_buff *skb)
 	x->curlft.bytes += skb->len;
 	x->curlft.packets++;
 	spin_unlock_bh(&x->lock);
-	if ((skb->dst = dst_pop(dst)) == NULL)
+	if ((skb->dst = dst_pop(dst)) == NULL) {
+		err = -EHOSTUNREACH;
 		goto error_nolock;
+	}
 	return NET_XMIT_BYPASS;

 error:

--- a/net/ipv4/esp.c
+++ b/net/ipv4/esp.c
@@ -145,8 +145,10 @@ int esp_output(struct sk_buff *skb)
 	x->curlft.bytes += skb->len;
 	x->curlft.packets++;
 	spin_unlock_bh(&x->lock);
-	if ((skb->dst = dst_pop(dst)) == NULL)
+	if ((skb->dst = dst_pop(dst)) == NULL) {
+		err = -EHOSTUNREACH;
 		goto error_nolock;
+	}
 	return NET_XMIT_BYPASS;

 error:

--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@@ -136,8 +136,10 @@ int ah6_output(struct sk_buff *skb)
 	x->curlft.bytes += skb->len;
 	x->curlft.packets++;
 	spin_unlock_bh(&x->lock);
-	if ((skb->dst = dst_pop(dst)) == NULL)
+	if ((skb->dst = dst_pop(dst)) == NULL) {
+		err = -EHOSTUNREACH;
 		goto error_nolock;
+	}
 	return NET_XMIT_BYPASS;
 error:
 	spin_unlock_bh(&x->lock);

--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -241,8 +241,10 @@ int esp6_output(struct sk_buff *skb)
 	x->curlft.bytes += skb->len;
 	x->curlft.packets++;
 	spin_unlock_bh(&x->lock);
-	if ((skb->dst = dst_pop(dst)) == NULL)
+	if ((skb->dst = dst_pop(dst)) == NULL) {
+		err = -EHOSTUNREACH;
 		goto error_nolock;
+	}
 	return NET_XMIT_BYPASS;

 error: