aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ah4.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/ah4.c')
-rw-r--r--net/ipv4/ah4.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index 5fc346d8b566..d76803a3dcae 100644
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@@ -169,6 +169,8 @@ static int ah_input(struct xfrm_state *x, struct sk_buff *skb)
169 if (ip_clear_mutable_options(iph, &dummy)) 169 if (ip_clear_mutable_options(iph, &dummy))
170 goto out; 170 goto out;
171 } 171 }
172
173 spin_lock(&x->lock);
172 { 174 {
173 u8 auth_data[MAX_AH_AUTH_LEN]; 175 u8 auth_data[MAX_AH_AUTH_LEN];
174 176
@@ -176,13 +178,16 @@ static int ah_input(struct xfrm_state *x, struct sk_buff *skb)
176 skb_push(skb, ihl); 178 skb_push(skb, ihl);
177 err = ah_mac_digest(ahp, skb, ah->auth_data); 179 err = ah_mac_digest(ahp, skb, ah->auth_data);
178 if (err) 180 if (err)
179 goto out; 181 goto unlock;
180 err = -EINVAL; 182 if (memcmp(ahp->work_icv, auth_data, ahp->icv_trunc_len))
181 if (memcmp(ahp->work_icv, auth_data, ahp->icv_trunc_len)) { 183 err = -EBADMSG;
182 x->stats.integrity_failed++;
183 goto out;
184 }
185 } 184 }
185unlock:
186 spin_unlock(&x->lock);
187
188 if (err)
189 goto out;
190
186 skb->network_header += ah_hlen; 191 skb->network_header += ah_hlen;
187 memcpy(skb_network_header(skb), work_buf, ihl); 192 memcpy(skb_network_header(skb), work_buf, ihl);
188 skb->transport_header = skb->network_header; 193 skb->transport_header = skb->network_header;