git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
osst: cdev lock_kernel() pushdown.
[safe/jmp/linux-2.6]
/
net
/
ipv4
/
ah4.c
diff --git
a/net/ipv4/ah4.c
b/net/ipv4/ah4.c
index
aed537f
..
8219b7e
100644
(file)
--- a/
net/ipv4/ah4.c
+++ b/
net/ipv4/ah4.c
@@
-1,20
+1,20
@@
-#include <linux/
config
.h>
+#include <linux/
err
.h>
#include <linux/module.h>
#include <net/ip.h>
#include <net/xfrm.h>
#include <net/ah.h>
#include <linux/crypto.h>
#include <linux/pfkeyv2.h>
#include <linux/module.h>
#include <net/ip.h>
#include <net/xfrm.h>
#include <net/ah.h>
#include <linux/crypto.h>
#include <linux/pfkeyv2.h>
+#include <linux/spinlock.h>
#include <net/icmp.h>
#include <net/protocol.h>
#include <net/icmp.h>
#include <net/protocol.h>
-#include <asm/scatterlist.h>
/* Clear mutable options and find final destination to substitute
* into IP header for icv calculation. Options are already checked
* for validity, so paranoia is not required. */
/* Clear mutable options and find final destination to substitute
* into IP header for icv calculation. Options are already checked
* for validity, so paranoia is not required. */
-static int ip_clear_mutable_options(struct iphdr *iph,
u
32 *daddr)
+static int ip_clear_mutable_options(struct iphdr *iph,
__be
32 *daddr)
{
unsigned char * optptr = (unsigned char*)(iph+1);
int l = iph->ihl*4 - sizeof(struct iphdr);
{
unsigned char * optptr = (unsigned char*)(iph+1);
int l = iph->ihl*4 - sizeof(struct iphdr);
@@
-35,7
+35,7
@@
static int ip_clear_mutable_options(struct iphdr *iph, u32 *daddr)
switch (*optptr) {
case IPOPT_SEC:
case 0x85: /* Some "Extended Security" crap. */
switch (*optptr) {
case IPOPT_SEC:
case 0x85: /* Some "Extended Security" crap. */
- case
0x86: /* Another "Commercial Security" crap. */
+ case
IPOPT_CIPSO:
case IPOPT_RA:
case 0x80|21: /* RFC1770 */
break;
case IPOPT_RA:
case 0x80|21: /* RFC1770 */
break;
@@
-46,7
+46,7
@@
static int ip_clear_mutable_options(struct iphdr *iph, u32 *daddr)
memcpy(daddr, optptr+optlen-4, 4);
/* Fall through */
default:
memcpy(daddr, optptr+optlen-4, 4);
/* Fall through */
default:
- memset(optptr
+2, 0, optlen-2
);
+ memset(optptr
, 0, optlen
);
}
l -= optlen;
optptr += optlen;
}
l -= optlen;
optptr += optlen;
@@
-65,7
+65,8
@@
static int ah_output(struct xfrm_state *x, struct sk_buff *skb)
char buf[60];
} tmp_iph;
char buf[60];
} tmp_iph;
- top_iph = skb->nh.iph;
+ skb_push(skb, -skb_network_offset(skb));
+ top_iph = ip_hdr(skb);
iph = &tmp_iph.iph;
iph->tos = top_iph->tos;
iph = &tmp_iph.iph;
iph->tos = top_iph->tos;
@@
-80,24
+81,30
@@
static int ah_output(struct xfrm_state *x, struct sk_buff *skb)
goto error;
}
goto error;
}
- ah = (struct ip_auth_hdr *)((char *)top_iph+top_iph->ihl*4);
- ah->nexthdr = top_iph->protocol;
+ ah = ip_auth_hdr(skb);
+ ah->nexthdr = *skb_mac_header(skb);
+ *skb_mac_header(skb) = IPPROTO_AH;
top_iph->tos = 0;
top_iph->tot_len = htons(skb->len);
top_iph->frag_off = 0;
top_iph->ttl = 0;
top_iph->tos = 0;
top_iph->tot_len = htons(skb->len);
top_iph->frag_off = 0;
top_iph->ttl = 0;
- top_iph->protocol = IPPROTO_AH;
top_iph->check = 0;
ahp = x->data;
top_iph->check = 0;
ahp = x->data;
- ah->hdrlen = (XFRM_ALIGN8(sizeof(struct ip_auth_hdr) +
- ahp->icv_trunc_len) >> 2) - 2;
+ ah->hdrlen = (XFRM_ALIGN8(sizeof(*ah) + ahp->icv_trunc_len) >> 2) - 2;
ah->reserved = 0;
ah->spi = x->id.spi;
ah->reserved = 0;
ah->spi = x->id.spi;
- ah->seq_no = htonl(++x->replay.oseq);
- ahp->icv(ahp, skb, ah->auth_data);
+ ah->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output);
+
+ spin_lock_bh(&x->lock);
+ err = ah_mac_digest(ahp, skb, ah->auth_data);
+ memcpy(ah->auth_data, ahp->work_icv, ahp->icv_trunc_len);
+ spin_unlock_bh(&x->lock);
+
+ if (err)
+ goto error;
top_iph->tos = iph->tos;
top_iph->ttl = iph->ttl;
top_iph->tos = iph->tos;
top_iph->ttl = iph->ttl;
@@
-107,31
+114,33
@@
static int ah_output(struct xfrm_state *x, struct sk_buff *skb)
memcpy(top_iph+1, iph+1, top_iph->ihl*4 - sizeof(struct iphdr));
}
memcpy(top_iph+1, iph+1, top_iph->ihl*4 - sizeof(struct iphdr));
}
- ip_send_check(top_iph);
-
err = 0;
error:
return err;
}
err = 0;
error:
return err;
}
-static int ah_input(struct xfrm_state *x, struct
xfrm_decap_state *decap, struct
sk_buff *skb)
+static int ah_input(struct xfrm_state *x, struct sk_buff *skb)
{
int ah_hlen;
{
int ah_hlen;
+ int ihl;
+ int nexthdr;
+ int err = -EINVAL;
struct iphdr *iph;
struct ip_auth_hdr *ah;
struct ah_data *ahp;
char work_buf[60];
struct iphdr *iph;
struct ip_auth_hdr *ah;
struct ah_data *ahp;
char work_buf[60];
- if (!pskb_may_pull(skb, sizeof(
struct ip_auth_hdr
)))
+ if (!pskb_may_pull(skb, sizeof(
*ah
)))
goto out;
goto out;
- ah = (struct ip_auth_hdr*)skb->data;
+ ah = (struct ip_auth_hdr
*)skb->data;
ahp = x->data;
ahp = x->data;
+ nexthdr = ah->nexthdr;
ah_hlen = (ah->hdrlen + 2) << 2;
ah_hlen = (ah->hdrlen + 2) << 2;
-
- if (ah_hlen != XFRM_ALIGN8(sizeof(
struct ip_auth_hdr
) + ahp->icv_full_len) &&
- ah_hlen != XFRM_ALIGN8(sizeof(
struct ip_auth_hdr) + ahp->icv_trunc_len))
+
+ if (ah_hlen != XFRM_ALIGN8(sizeof(
*ah
) + ahp->icv_full_len) &&
+ ah_hlen != XFRM_ALIGN8(sizeof(
*ah) + ahp->icv_trunc_len))
goto out;
if (!pskb_may_pull(skb, ah_hlen))
goto out;
if (!pskb_may_pull(skb, ah_hlen))
@@
-145,42
+154,49
@@
static int ah_input(struct xfrm_state *x, struct xfrm_decap_state *decap, struct
skb->ip_summed = CHECKSUM_NONE;
skb->ip_summed = CHECKSUM_NONE;
- ah = (struct ip_auth_hdr*)skb->data;
- iph =
skb->nh.iph
;
+ ah = (struct ip_auth_hdr
*)skb->data;
+ iph =
ip_hdr(skb)
;
- memcpy(work_buf, iph, iph->ihl*4);
+ ihl = skb->data - skb_network_header(skb);
+ memcpy(work_buf, iph, ihl);
iph->ttl = 0;
iph->tos = 0;
iph->frag_off = 0;
iph->check = 0;
iph->ttl = 0;
iph->tos = 0;
iph->frag_off = 0;
iph->check = 0;
- if (i
ph->ihl != 5
) {
-
u
32 dummy;
+ if (i
hl > sizeof(*iph)
) {
+
__be
32 dummy;
if (ip_clear_mutable_options(iph, &dummy))
goto out;
}
if (ip_clear_mutable_options(iph, &dummy))
goto out;
}
- {
+
+ spin_lock(&x->lock);
+ {
u8 auth_data[MAX_AH_AUTH_LEN];
u8 auth_data[MAX_AH_AUTH_LEN];
-
+
memcpy(auth_data, ah->auth_data, ahp->icv_trunc_len);
memcpy(auth_data, ah->auth_data, ahp->icv_trunc_len);
- skb_push(skb,
skb->data - skb->nh.raw
);
-
ahp->icv
(ahp, skb, ah->auth_data);
- if (
memcmp(ah->auth_data, auth_data, ahp->icv_trunc_len)) {
-
x->stats.integrity_failed++
;
- goto out;
- }
+ skb_push(skb,
ihl
);
+
err = ah_mac_digest
(ahp, skb, ah->auth_data);
+ if (
err)
+
goto unlock
;
+ if (memcmp(ahp->work_icv, auth_data, ahp->icv_trunc_len))
+ err = -EBADMSG;
}
}
- ((struct iphdr*)work_buf)->protocol = ah->nexthdr;
- skb->nh.raw = skb_pull(skb, ah_hlen);
- memcpy(skb->nh.raw, work_buf, iph->ihl*4);
- skb->nh.iph->tot_len = htons(skb->len);
- skb_pull(skb, skb->nh.iph->ihl*4);
- skb->h.raw = skb->data;
+unlock:
+ spin_unlock(&x->lock);
- return 0;
+ if (err)
+ goto out;
+
+ skb->network_header += ah_hlen;
+ memcpy(skb_network_header(skb), work_buf, ihl);
+ skb->transport_header = skb->network_header;
+ __skb_pull(skb, ah_hlen + ihl);
+
+ return nexthdr;
out:
out:
- return
-EINVAL
;
+ return
err
;
}
static void ah4_err(struct sk_buff *skb, u32 info)
}
static void ah4_err(struct sk_buff *skb, u32 info)
@@
-189,8
+205,8
@@
static void ah4_err(struct sk_buff *skb, u32 info)
struct ip_auth_hdr *ah = (struct ip_auth_hdr*)(skb->data+(iph->ihl<<2));
struct xfrm_state *x;
struct ip_auth_hdr *ah = (struct ip_auth_hdr*)(skb->data+(iph->ihl<<2));
struct xfrm_state *x;
- if (
skb->h.icmph
->type != ICMP_DEST_UNREACH ||
-
skb->h.icmph
->code != ICMP_FRAG_NEEDED)
+ if (
icmp_hdr(skb)
->type != ICMP_DEST_UNREACH ||
+
icmp_hdr(skb)
->code != ICMP_FRAG_NEEDED)
return;
x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, ah->spi, IPPROTO_AH, AF_INET);
return;
x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, ah->spi, IPPROTO_AH, AF_INET);
@@
-205,58
+221,56
@@
static int ah_init_state(struct xfrm_state *x)
{
struct ah_data *ahp = NULL;
struct xfrm_algo_desc *aalg_desc;
{
struct ah_data *ahp = NULL;
struct xfrm_algo_desc *aalg_desc;
+ struct crypto_hash *tfm;
if (!x->aalg)
goto error;
if (!x->aalg)
goto error;
- /* null auth can use a zero length key */
- if (x->aalg->alg_key_len > 512)
- goto error;
-
if (x->encap)
goto error;
if (x->encap)
goto error;
- ahp = k
m
alloc(sizeof(*ahp), GFP_KERNEL);
+ ahp = k
z
alloc(sizeof(*ahp), GFP_KERNEL);
if (ahp == NULL)
return -ENOMEM;
if (ahp == NULL)
return -ENOMEM;
- memset(ahp, 0, sizeof(*ahp));
+ tfm = crypto_alloc_hash(x->aalg->alg_name, 0, CRYPTO_ALG_ASYNC);
+ if (IS_ERR(tfm))
+ goto error;
- ahp->key = x->aalg->alg_key;
- ahp->key_len = (x->aalg->alg_key_len+7)/8;
- ahp->tfm = crypto_alloc_tfm(x->aalg->alg_name, 0);
- if (!ahp->tfm)
+ ahp->tfm = tfm;
+ if (crypto_hash_setkey(tfm, x->aalg->alg_key,
+ (x->aalg->alg_key_len + 7) / 8))
goto error;
goto error;
- ahp->icv = ah_hmac_digest;
-
+
/*
* Lookup the algorithm description maintained by xfrm_algo,
* verify crypto transform properties, and store information
* we need for AH processing. This lookup cannot fail here
/*
* Lookup the algorithm description maintained by xfrm_algo,
* verify crypto transform properties, and store information
* we need for AH processing. This lookup cannot fail here
- * after a successful crypto_alloc_
tfm
().
+ * after a successful crypto_alloc_
hash
().
*/
aalg_desc = xfrm_aalg_get_byname(x->aalg->alg_name, 0);
BUG_ON(!aalg_desc);
if (aalg_desc->uinfo.auth.icv_fullbits/8 !=
*/
aalg_desc = xfrm_aalg_get_byname(x->aalg->alg_name, 0);
BUG_ON(!aalg_desc);
if (aalg_desc->uinfo.auth.icv_fullbits/8 !=
- crypto_
tfm_alg_digestsize(ahp->
tfm)) {
+ crypto_
hash_digestsize(
tfm)) {
printk(KERN_INFO "AH: %s digestsize %u != %hu\n",
printk(KERN_INFO "AH: %s digestsize %u != %hu\n",
- x->aalg->alg_name, crypto_
tfm_alg_digestsize(ahp->
tfm),
+ x->aalg->alg_name, crypto_
hash_digestsize(
tfm),
aalg_desc->uinfo.auth.icv_fullbits/8);
goto error;
}
aalg_desc->uinfo.auth.icv_fullbits/8);
goto error;
}
-
+
ahp->icv_full_len = aalg_desc->uinfo.auth.icv_fullbits/8;
ahp->icv_trunc_len = aalg_desc->uinfo.auth.icv_truncbits/8;
ahp->icv_full_len = aalg_desc->uinfo.auth.icv_fullbits/8;
ahp->icv_trunc_len = aalg_desc->uinfo.auth.icv_truncbits/8;
-
+
BUG_ON(ahp->icv_trunc_len > MAX_AH_AUTH_LEN);
BUG_ON(ahp->icv_trunc_len > MAX_AH_AUTH_LEN);
-
+
ahp->work_icv = kmalloc(ahp->icv_full_len, GFP_KERNEL);
if (!ahp->work_icv)
goto error;
ahp->work_icv = kmalloc(ahp->icv_full_len, GFP_KERNEL);
if (!ahp->work_icv)
goto error;
-
- x->props.header_len = XFRM_ALIGN8(sizeof(struct ip_auth_hdr) + ahp->icv_trunc_len);
- if (x->props.mode)
+
+ x->props.header_len = XFRM_ALIGN8(sizeof(struct ip_auth_hdr) +
+ ahp->icv_trunc_len);
+ if (x->props.mode == XFRM_MODE_TUNNEL)
x->props.header_len += sizeof(struct iphdr);
x->data = ahp;
x->props.header_len += sizeof(struct iphdr);
x->data = ahp;
@@
-265,7
+279,7
@@
static int ah_init_state(struct xfrm_state *x)
error:
if (ahp) {
kfree(ahp->work_icv);
error:
if (ahp) {
kfree(ahp->work_icv);
- crypto_free_
tfm
(ahp->tfm);
+ crypto_free_
hash
(ahp->tfm);
kfree(ahp);
}
return -EINVAL;
kfree(ahp);
}
return -EINVAL;
@@
-280,17
+294,18
@@
static void ah_destroy(struct xfrm_state *x)
kfree(ahp->work_icv);
ahp->work_icv = NULL;
kfree(ahp->work_icv);
ahp->work_icv = NULL;
- crypto_free_
tfm
(ahp->tfm);
+ crypto_free_
hash
(ahp->tfm);
ahp->tfm = NULL;
kfree(ahp);
}
ahp->tfm = NULL;
kfree(ahp);
}
-static struct xfrm_type ah_type =
+static
const
struct xfrm_type ah_type =
{
.description = "AH4",
.owner = THIS_MODULE,
.proto = IPPROTO_AH,
{
.description = "AH4",
.owner = THIS_MODULE,
.proto = IPPROTO_AH,
+ .flags = XFRM_TYPE_REPLAY_PROT,
.init_state = ah_init_state,
.destructor = ah_destroy,
.input = ah_input,
.init_state = ah_init_state,
.destructor = ah_destroy,
.input = ah_input,
@@
-328,3
+343,4
@@
static void __exit ah4_fini(void)
module_init(ah4_init);
module_exit(ah4_fini);
MODULE_LICENSE("GPL");
module_init(ah4_init);
module_exit(ah4_fini);
MODULE_LICENSE("GPL");
+MODULE_ALIAS_XFRM_TYPE(AF_INET, XFRM_PROTO_AH);