Commit 98b29a73 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://kernel.bkbits.net/davem/net-2.6

into ppc970.osdl.org:/home/torvalds/v2.5/linux
parents 6689319e dd6e1c3d
...@@ -518,6 +518,8 @@ int esp_init_state(struct xfrm_state *x, void *args) ...@@ -518,6 +518,8 @@ int esp_init_state(struct xfrm_state *x, void *args)
esp->conf.padlen = 0; esp->conf.padlen = 0;
if (esp->conf.ivlen) { if (esp->conf.ivlen) {
esp->conf.ivec = kmalloc(esp->conf.ivlen, GFP_KERNEL); esp->conf.ivec = kmalloc(esp->conf.ivlen, GFP_KERNEL);
if (unlikely(esp->conf.ivec == NULL))
goto error;
get_random_bytes(esp->conf.ivec, esp->conf.ivlen); get_random_bytes(esp->conf.ivec, esp->conf.ivlen);
} }
crypto_cipher_setkey(esp->conf.tfm, esp->conf.key, esp->conf.key_len); crypto_cipher_setkey(esp->conf.tfm, esp->conf.key, esp->conf.key_len);
......
...@@ -761,8 +761,11 @@ int ip_append_data(struct sock *sk, ...@@ -761,8 +761,11 @@ int ip_append_data(struct sock *sk,
*/ */
opt = ipc->opt; opt = ipc->opt;
if (opt) { if (opt) {
if (inet->cork.opt == NULL) if (inet->cork.opt == NULL) {
inet->cork.opt = kmalloc(sizeof(struct ip_options) + 40, sk->sk_allocation); inet->cork.opt = kmalloc(sizeof(struct ip_options) + 40, sk->sk_allocation);
if (unlikely(inet->cork.opt == NULL))
return -ENOBUFS;
}
memcpy(inet->cork.opt, opt, sizeof(struct ip_options)+opt->optlen); memcpy(inet->cork.opt, opt, sizeof(struct ip_options)+opt->optlen);
inet->cork.flags |= IPCORK_OPT; inet->cork.flags |= IPCORK_OPT;
inet->cork.addr = ipc->addr; inet->cork.addr = ipc->addr;
......
...@@ -2673,26 +2673,6 @@ static int inet6_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb) ...@@ -2673,26 +2673,6 @@ static int inet6_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
goto done; goto done;
} }
#endif #endif
/* multicast address */
for (ifmca = idev->mc_list; ifmca;
ifmca = ifmca->next, ip_idx++) {
if (ip_idx < s_ip_idx)
continue;
if ((err = inet6_fill_ifmcaddr(skb, ifmca,
NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq, RTM_NEWADDR)) <= 0)
goto done;
}
/* anycast address */
for (ifaca = idev->ac_list; ifaca;
ifaca = ifaca->aca_next, ip_idx++) {
if (ip_idx < s_ip_idx)
continue;
if ((err = inet6_fill_ifacaddr(skb, ifaca,
NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq, RTM_NEWADDR)) <= 0)
goto done;
}
read_unlock_bh(&idev->lock); read_unlock_bh(&idev->lock);
in6_dev_put(idev); in6_dev_put(idev);
} }
......
...@@ -422,6 +422,8 @@ int esp6_init_state(struct xfrm_state *x, void *args) ...@@ -422,6 +422,8 @@ int esp6_init_state(struct xfrm_state *x, void *args)
esp->conf.padlen = 0; esp->conf.padlen = 0;
if (esp->conf.ivlen) { if (esp->conf.ivlen) {
esp->conf.ivec = kmalloc(esp->conf.ivlen, GFP_KERNEL); esp->conf.ivec = kmalloc(esp->conf.ivlen, GFP_KERNEL);
if (unlikely(esp->conf.ivec == NULL))
goto error;
get_random_bytes(esp->conf.ivec, esp->conf.ivlen); get_random_bytes(esp->conf.ivec, esp->conf.ivlen);
} }
crypto_cipher_setkey(esp->conf.tfm, esp->conf.key, esp->conf.key_len); crypto_cipher_setkey(esp->conf.tfm, esp->conf.key, esp->conf.key_len);
......
...@@ -816,9 +816,12 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to, int offse ...@@ -816,9 +816,12 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to, int offse
* setup for corking * setup for corking
*/ */
if (opt) { if (opt) {
if (np->cork.opt == NULL) if (np->cork.opt == NULL) {
np->cork.opt = kmalloc(opt->tot_len, np->cork.opt = kmalloc(opt->tot_len,
sk->sk_allocation); sk->sk_allocation);
if (unlikely(np->cork.opt == NULL))
return -ENOBUFS;
}
memcpy(np->cork.opt, opt, opt->tot_len); memcpy(np->cork.opt, opt, opt->tot_len);
inet->cork.flags |= IPCORK_OPT; inet->cork.flags |= IPCORK_OPT;
/* need source address above miyazawa*/ /* need source address above miyazawa*/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment