Skip to content

L
linux
Commit 0f5a2c55 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [CRYPTO] users: Fix up scatterlist conversion errors
  [CRYPTO] tcrypt: Move sg_init_table out of timing loops
  [NETNS]: Fix get_net_ns_by_pid
  [NET]: Marking struct pernet_operations __net_initdata was inappropriate
  [INET] ESP: Must #include <linux/scatterlist.h>
  [TCP] IPV6: fix softnet build breakage
parents 26adc0d5 68e3f5dd
Show whitespace changes
Inline Side-by-side
Showing with 118 additions and 76 deletions
crypto/tcrypt.c
View file @ 0f5a2c55
...@@ -572,9 +572,11 @@ static int test_hash_jiffies_digest(struct hash_desc *desc, char *p, int blen, ...@@ -572,9 +572,11 @@ static int test_hash_jiffies_digest(struct hash_desc *desc, char *p, int blen,
int bcount; int bcount;
int ret; int ret;
sg_init_table(sg, 1);
for (start = jiffies, end = start + sec * HZ, bcount = 0; for (start = jiffies, end = start + sec * HZ, bcount = 0;
time_before(jiffies, end); bcount++) { time_before(jiffies, end); bcount++) {
sg_init_one(sg, p, blen); sg_set_buf(sg, p, blen);
ret = crypto_hash_digest(desc, sg, blen, out); ret = crypto_hash_digest(desc, sg, blen, out);
if (ret) if (ret)
return ret; return ret;
...@@ -597,13 +599,15 @@ static int test_hash_jiffies(struct hash_desc *desc, char *p, int blen, ...@@ -597,13 +599,15 @@ static int test_hash_jiffies(struct hash_desc *desc, char *p, int blen,
if (plen == blen) if (plen == blen)
return test_hash_jiffies_digest(desc, p, blen, out, sec); return test_hash_jiffies_digest(desc, p, blen, out, sec);
sg_init_table(sg, 1);
for (start = jiffies, end = start + sec * HZ, bcount = 0; for (start = jiffies, end = start + sec * HZ, bcount = 0;
time_before(jiffies, end); bcount++) { time_before(jiffies, end); bcount++) {
ret = crypto_hash_init(desc); ret = crypto_hash_init(desc);
if (ret) if (ret)
return ret; return ret;
for (pcount = 0; pcount < blen; pcount += plen) { for (pcount = 0; pcount < blen; pcount += plen) {
sg_init_one(sg, p + pcount, plen); sg_set_buf(sg, p + pcount, plen);
ret = crypto_hash_update(desc, sg, plen); ret = crypto_hash_update(desc, sg, plen);
if (ret) if (ret)
return ret; return ret;
...@@ -628,12 +632,14 @@ static int test_hash_cycles_digest(struct hash_desc *desc, char *p, int blen, ...@@ -628,12 +632,14 @@ static int test_hash_cycles_digest(struct hash_desc *desc, char *p, int blen,
int i; int i;
int ret; int ret;
sg_init_table(sg, 1);
local_bh_disable(); local_bh_disable();
local_irq_disable(); local_irq_disable();
/* Warm-up run. */ /* Warm-up run. */
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
sg_init_one(sg, p, blen); sg_set_buf(sg, p, blen);
ret = crypto_hash_digest(desc, sg, blen, out); ret = crypto_hash_digest(desc, sg, blen, out);
if (ret) if (ret)
goto out; goto out;
...@@ -645,7 +651,7 @@ static int test_hash_cycles_digest(struct hash_desc *desc, char *p, int blen, ...@@ -645,7 +651,7 @@ static int test_hash_cycles_digest(struct hash_desc *desc, char *p, int blen,
start = get_cycles(); start = get_cycles();
sg_init_one(sg, p, blen); sg_set_buf(sg, p, blen);
ret = crypto_hash_digest(desc, sg, blen, out); ret = crypto_hash_digest(desc, sg, blen, out);
if (ret) if (ret)
goto out; goto out;
...@@ -679,6 +685,8 @@ static int test_hash_cycles(struct hash_desc *desc, char *p, int blen, ...@@ -679,6 +685,8 @@ static int test_hash_cycles(struct hash_desc *desc, char *p, int blen,
if (plen == blen) if (plen == blen)
return test_hash_cycles_digest(desc, p, blen, out); return test_hash_cycles_digest(desc, p, blen, out);
sg_init_table(sg, 1);
local_bh_disable(); local_bh_disable();
local_irq_disable(); local_irq_disable();
...@@ -688,7 +696,7 @@ static int test_hash_cycles(struct hash_desc *desc, char *p, int blen, ...@@ -688,7 +696,7 @@ static int test_hash_cycles(struct hash_desc *desc, char *p, int blen,
if (ret) if (ret)
goto out; goto out;
for (pcount = 0; pcount < blen; pcount += plen) { for (pcount = 0; pcount < blen; pcount += plen) {
sg_init_one(sg, p + pcount, plen); sg_set_buf(sg, p + pcount, plen);
ret = crypto_hash_update(desc, sg, plen); ret = crypto_hash_update(desc, sg, plen);
if (ret) if (ret)
goto out; goto out;
...@@ -708,7 +716,7 @@ static int test_hash_cycles(struct hash_desc *desc, char *p, int blen, ...@@ -708,7 +716,7 @@ static int test_hash_cycles(struct hash_desc *desc, char *p, int blen,
if (ret) if (ret)
goto out; goto out;
for (pcount = 0; pcount < blen; pcount += plen) { for (pcount = 0; pcount < blen; pcount += plen) {
sg_init_one(sg, p + pcount, plen); sg_set_buf(sg, p + pcount, plen);
ret = crypto_hash_update(desc, sg, plen); ret = crypto_hash_update(desc, sg, plen);
if (ret) if (ret)
goto out; goto out;
......
drivers/crypto/padlock-sha.c
View file @ 0f5a2c55
...@@ -55,7 +55,7 @@ static void padlock_sha_bypass(struct crypto_tfm *tfm) ...@@ -55,7 +55,7 @@ static void padlock_sha_bypass(struct crypto_tfm *tfm)
if (ctx(tfm)->data && ctx(tfm)->used) { if (ctx(tfm)->data && ctx(tfm)->used) {
struct scatterlist sg; struct scatterlist sg;
sg_set_buf(&sg, ctx(tfm)->data, ctx(tfm)->used); sg_init_one(&sg, ctx(tfm)->data, ctx(tfm)->used);
crypto_hash_update(&ctx(tfm)->fallback, &sg, sg.length); crypto_hash_update(&ctx(tfm)->fallback, &sg, sg.length);
} }
...@@ -79,7 +79,7 @@ static void padlock_sha_update(struct crypto_tfm *tfm, ...@@ -79,7 +79,7 @@ static void padlock_sha_update(struct crypto_tfm *tfm,
if (unlikely(ctx(tfm)->bypass)) { if (unlikely(ctx(tfm)->bypass)) {
struct scatterlist sg; struct scatterlist sg;
sg_set_buf(&sg, (uint8_t *)data, length); sg_init_one(&sg, (uint8_t *)data, length);
crypto_hash_update(&ctx(tfm)->fallback, &sg, length); crypto_hash_update(&ctx(tfm)->fallback, &sg, length);
return; return;
} }
......
drivers/md/dm-crypt.c
View file @ 0f5a2c55
...@@ -168,7 +168,7 @@ static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti, ...@@ -168,7 +168,7 @@ static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti,
return -ENOMEM; return -ENOMEM;
} }
sg_set_buf(&sg, cc->key, cc->key_size); sg_init_one(&sg, cc->key, cc->key_size);
desc.tfm = hash_tfm; desc.tfm = hash_tfm;
desc.flags = CRYPTO_TFM_REQ_MAY_SLEEP; desc.flags = CRYPTO_TFM_REQ_MAY_SLEEP;
err = crypto_hash_digest(&desc, &sg, cc->key_size, salt); err = crypto_hash_digest(&desc, &sg, cc->key_size, salt);
......
drivers/net/loopback.c
View file @ 0f5a2c55
...@@ -284,7 +284,7 @@ static __net_exit void loopback_net_exit(struct net *net) ...@@ -284,7 +284,7 @@ static __net_exit void loopback_net_exit(struct net *net)
unregister_netdev(dev); unregister_netdev(dev);
} }
static struct pernet_operations __net_initdata loopback_net_ops = { static struct pernet_operations loopback_net_ops = {
.init = loopback_net_init, .init = loopback_net_init,
.exit = loopback_net_exit, .exit = loopback_net_exit,
}; };
......
drivers/net/ppp_mppe.c
View file @ 0f5a2c55
...@@ -68,7 +68,7 @@ MODULE_VERSION("1.0.2"); ...@@ -68,7 +68,7 @@ MODULE_VERSION("1.0.2");
static unsigned int static unsigned int
setup_sg(struct scatterlist *sg, const void *address, unsigned int length) setup_sg(struct scatterlist *sg, const void *address, unsigned int length)
{ {
sg_init_one(sg, address, length); sg_set_buf(sg, address, length);
return length; return length;
} }
...@@ -140,6 +140,8 @@ static void get_new_key_from_sha(struct ppp_mppe_state * state) ...@@ -140,6 +140,8 @@ static void get_new_key_from_sha(struct ppp_mppe_state * state)
struct scatterlist sg[4]; struct scatterlist sg[4];
unsigned int nbytes; unsigned int nbytes;
sg_init_table(sg, 4);
nbytes = setup_sg(&sg[0], state->master_key, state->keylen); nbytes = setup_sg(&sg[0], state->master_key, state->keylen);
nbytes += setup_sg(&sg[1], sha_pad->sha_pad1, nbytes += setup_sg(&sg[1], sha_pad->sha_pad1,
sizeof(sha_pad->sha_pad1)); sizeof(sha_pad->sha_pad1));
...@@ -166,6 +168,8 @@ static void mppe_rekey(struct ppp_mppe_state * state, int initial_key) ...@@ -166,6 +168,8 @@ static void mppe_rekey(struct ppp_mppe_state * state, int initial_key)
if (!initial_key) { if (!initial_key) {
crypto_blkcipher_setkey(state->arc4, state->sha1_digest, crypto_blkcipher_setkey(state->arc4, state->sha1_digest,
state->keylen); state->keylen);
sg_init_table(sg_in, 1);
sg_init_table(sg_out, 1);
setup_sg(sg_in, state->sha1_digest, state->keylen); setup_sg(sg_in, state->sha1_digest, state->keylen);
setup_sg(sg_out, state->session_key, state->keylen); setup_sg(sg_out, state->session_key, state->keylen);
if (crypto_blkcipher_encrypt(&desc, sg_out, sg_in, if (crypto_blkcipher_encrypt(&desc, sg_out, sg_in,
...@@ -421,6 +425,8 @@ mppe_compress(void *arg, unsigned char *ibuf, unsigned char *obuf, ...@@ -421,6 +425,8 @@ mppe_compress(void *arg, unsigned char *ibuf, unsigned char *obuf,
isize -= 2; isize -= 2;
/* Encrypt packet */ /* Encrypt packet */
sg_init_table(sg_in, 1);
sg_init_table(sg_out, 1);
setup_sg(sg_in, ibuf, isize); setup_sg(sg_in, ibuf, isize);
setup_sg(sg_out, obuf, osize); setup_sg(sg_out, obuf, osize);
if (crypto_blkcipher_encrypt(&desc, sg_out, sg_in, isize) != 0) { if (crypto_blkcipher_encrypt(&desc, sg_out, sg_in, isize) != 0) {
...@@ -608,6 +614,8 @@ mppe_decompress(void *arg, unsigned char *ibuf, int isize, unsigned char *obuf, ...@@ -608,6 +614,8 @@ mppe_decompress(void *arg, unsigned char *ibuf, int isize, unsigned char *obuf,
* Decrypt the first byte in order to check if it is * Decrypt the first byte in order to check if it is
* a compressed or uncompressed protocol field. * a compressed or uncompressed protocol field.
*/ */
sg_init_table(sg_in, 1);
sg_init_table(sg_out, 1);
setup_sg(sg_in, ibuf, 1); setup_sg(sg_in, ibuf, 1);
setup_sg(sg_out, obuf, 1); setup_sg(sg_out, obuf, 1);
if (crypto_blkcipher_decrypt(&desc, sg_out, sg_in, 1) != 0) { if (crypto_blkcipher_decrypt(&desc, sg_out, sg_in, 1) != 0) {
......
drivers/scsi/iscsi_tcp.c
View file @ 0f5a2c55
...@@ -674,9 +674,8 @@ partial_sg_digest_update(struct hash_desc *desc, struct scatterlist *sg, ...@@ -674,9 +674,8 @@ partial_sg_digest_update(struct hash_desc *desc, struct scatterlist *sg,
{ {
struct scatterlist temp; struct scatterlist temp;
memcpy(&temp, sg, sizeof(struct scatterlist)); sg_init_table(&temp, 1);
temp.offset = offset; sg_set_page(&temp, sg_page(sg), length, offset);
temp.length = length;
crypto_hash_update(desc, &temp, length); crypto_hash_update(desc, &temp, length);
} }
......
fs/ecryptfs/crypto.c
View file @ 0f5a2c55
...@@ -279,6 +279,8 @@ int virt_to_scatterlist(const void *addr, int size, struct scatterlist *sg, ...@@ -279,6 +279,8 @@ int virt_to_scatterlist(const void *addr, int size, struct scatterlist *sg,
int offset; int offset;
int remainder_of_page; int remainder_of_page;
sg_init_table(sg, sg_size);
while (size > 0 && i < sg_size) { while (size > 0 && i < sg_size) {
pg = virt_to_page(addr); pg = virt_to_page(addr);
offset = offset_in_page(addr); offset = offset_in_page(addr);
......
fs/proc/proc_net.c
View file @ 0f5a2c55
...@@ -185,7 +185,7 @@ static __net_exit void proc_net_ns_exit(struct net *net) ...@@ -185,7 +185,7 @@ static __net_exit void proc_net_ns_exit(struct net *net)
kfree(net->proc_net_root); kfree(net->proc_net_root);
} }
static struct pernet_operations __net_initdata proc_net_ns_ops = { static struct pernet_operations proc_net_ns_ops = {
.init = proc_net_ns_init, .init = proc_net_ns_init,
.exit = proc_net_ns_exit, .exit = proc_net_ns_exit,
}; };
......
include/net/net_namespace.h
View file @ 0f5a2c55
...@@ -102,11 +102,9 @@ static inline void release_net(struct net *net) ...@@ -102,11 +102,9 @@ static inline void release_net(struct net *net)
#ifdef CONFIG_NET_NS #ifdef CONFIG_NET_NS
#define __net_init #define __net_init
#define __net_exit #define __net_exit
#define __net_initdata
#else #else
#define __net_init __init #define __net_init __init
#define __net_exit __exit_refok #define __net_exit __exit_refok
#define __net_initdata __initdata
#endif #endif
struct pernet_operations { struct pernet_operations {
......
net/core/dev.c
View file @ 0f5a2c55
...@@ -2668,7 +2668,7 @@ static void __net_exit dev_proc_net_exit(struct net *net) ...@@ -2668,7 +2668,7 @@ static void __net_exit dev_proc_net_exit(struct net *net)
proc_net_remove(net, "dev"); proc_net_remove(net, "dev");
} }
static struct pernet_operations __net_initdata dev_proc_ops = { static struct pernet_operations dev_proc_ops = {
.init = dev_proc_net_init, .init = dev_proc_net_init,
.exit = dev_proc_net_exit, .exit = dev_proc_net_exit,
}; };
...@@ -4328,7 +4328,7 @@ static void __net_exit netdev_exit(struct net *net) ...@@ -4328,7 +4328,7 @@ static void __net_exit netdev_exit(struct net *net)
kfree(net->dev_index_head); kfree(net->dev_index_head);
} }
static struct pernet_operations __net_initdata netdev_net_ops = { static struct pernet_operations netdev_net_ops = {
.init = netdev_init, .init = netdev_init,
.exit = netdev_exit, .exit = netdev_exit,
}; };
...@@ -4359,7 +4359,7 @@ static void __net_exit default_device_exit(struct net *net) ...@@ -4359,7 +4359,7 @@ static void __net_exit default_device_exit(struct net *net)
rtnl_unlock(); rtnl_unlock();
} }
static struct pernet_operations __net_initdata default_device_ops = { static struct pernet_operations default_device_ops = {
.exit = default_device_exit, .exit = default_device_exit,
}; };
......
net/core/dev_mcast.c
View file @ 0f5a2c55
...@@ -285,7 +285,7 @@ static void __net_exit dev_mc_net_exit(struct net *net) ...@@ -285,7 +285,7 @@ static void __net_exit dev_mc_net_exit(struct net *net)
proc_net_remove(net, "dev_mcast"); proc_net_remove(net, "dev_mcast");
} }
static struct pernet_operations __net_initdata dev_mc_net_ops = { static struct pernet_operations dev_mc_net_ops = {
.init = dev_mc_net_init, .init = dev_mc_net_init,
.exit = dev_mc_net_exit, .exit = dev_mc_net_exit,
}; };
......
net/core/rtnetlink.c
View file @ 0f5a2c55
...@@ -742,7 +742,7 @@ static struct net *get_net_ns_by_pid(pid_t pid) ...@@ -742,7 +742,7 @@ static struct net *get_net_ns_by_pid(pid_t pid)
/* Lookup the network namespace */ /* Lookup the network namespace */
net = ERR_PTR(-ESRCH); net = ERR_PTR(-ESRCH);
rcu_read_lock(); rcu_read_lock();
tsk = find_task_by_pid(pid); tsk = find_task_by_vpid(pid);
if (tsk) { if (tsk) {
struct nsproxy *nsproxy; struct nsproxy *nsproxy;
nsproxy = task_nsproxy(tsk); nsproxy = task_nsproxy(tsk);
......
net/ipv4/esp4.c
View file @ 0f5a2c55
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include <net/ip.h> #include <net/ip.h>
#include <net/xfrm.h> #include <net/xfrm.h>
#include <net/esp.h> #include <net/esp.h>
#include <asm/scatterlist.h> #include <linux/scatterlist.h>
#include <linux/crypto.h> #include <linux/crypto.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/pfkeyv2.h> #include <linux/pfkeyv2.h>
...@@ -111,7 +111,9 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb) ...@@ -111,7 +111,9 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
goto unlock; goto unlock;
} }
sg_init_table(sg, nfrags); sg_init_table(sg, nfrags);
skb_to_sgvec(skb, sg, esph->enc_data+esp->conf.ivlen-skb->data, clen); sg_mark_end(sg, skb_to_sgvec(skb, sg, esph->enc_data +
esp->conf.ivlen -
skb->data, clen));
err = crypto_blkcipher_encrypt(&desc, sg, sg, clen); err = crypto_blkcipher_encrypt(&desc, sg, sg, clen);
if (unlikely(sg != &esp->sgbuf[0])) if (unlikely(sg != &esp->sgbuf[0]))
kfree(sg); kfree(sg);
...@@ -203,7 +205,8 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb) ...@@ -203,7 +205,8 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb)
goto out; goto out;
} }
sg_init_table(sg, nfrags); sg_init_table(sg, nfrags);
skb_to_sgvec(skb, sg, sizeof(*esph) + esp->conf.ivlen, elen); sg_mark_end(sg, skb_to_sgvec(skb, sg, sizeof(*esph) + esp->conf.ivlen,
elen));
err = crypto_blkcipher_decrypt(&desc, sg, sg, elen); err = crypto_blkcipher_decrypt(&desc, sg, sg, elen);
if (unlikely(sg != &esp->sgbuf[0])) if (unlikely(sg != &esp->sgbuf[0]))
kfree(sg); kfree(sg);
......
net/ipv6/esp6.c
View file @ 0f5a2c55
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <net/ip.h> #include <net/ip.h>
#include <net/xfrm.h> #include <net/xfrm.h>
#include <net/esp.h> #include <net/esp.h>
#include <asm/scatterlist.h> #include <linux/scatterlist.h>
#include <linux/crypto.h> #include <linux/crypto.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/pfkeyv2.h> #include <linux/pfkeyv2.h>
...@@ -110,7 +110,9 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb) ...@@ -110,7 +110,9 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)
goto unlock; goto unlock;
} }
sg_init_table(sg, nfrags); sg_init_table(sg, nfrags);
skb_to_sgvec(skb, sg, esph->enc_data+esp->conf.ivlen-skb->data, clen); sg_mark_end(sg, skb_to_sgvec(skb, sg, esph->enc_data +
esp->conf.ivlen -
skb->data, clen));
err = crypto_blkcipher_encrypt(&desc, sg, sg, clen); err = crypto_blkcipher_encrypt(&desc, sg, sg, clen);
if (unlikely(sg != &esp->sgbuf[0])) if (unlikely(sg != &esp->sgbuf[0]))
kfree(sg); kfree(sg);
...@@ -207,7 +209,9 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb) ...@@ -207,7 +209,9 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb)
} }
} }
sg_init_table(sg, nfrags); sg_init_table(sg, nfrags);
skb_to_sgvec(skb, sg, sizeof(*esph) + esp->conf.ivlen, elen); sg_mark_end(sg, skb_to_sgvec(skb, sg,
sizeof(*esph) + esp->conf.ivlen,
elen));
ret = crypto_blkcipher_decrypt(&desc, sg, sg, elen); ret = crypto_blkcipher_decrypt(&desc, sg, sg, elen);
if (unlikely(sg != &esp->sgbuf[0])) if (unlikely(sg != &esp->sgbuf[0]))
kfree(sg); kfree(sg);
......
net/ipv6/tcp_ipv6.c
View file @ 0f5a2c55
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
#include <net/snmp.h> #include <net/snmp.h>
#include <net/dsfield.h> #include <net/dsfield.h>
#include <net/timewait_sock.h> #include <net/timewait_sock.h>
#include <net/netdma.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
......
net/netlink/af_netlink.c
View file @ 0f5a2c55
...@@ -1888,7 +1888,7 @@ static void __net_exit netlink_net_exit(struct net *net) ...@@ -1888,7 +1888,7 @@ static void __net_exit netlink_net_exit(struct net *net)
#endif #endif
} }
static struct pernet_operations __net_initdata netlink_net_ops = { static struct pernet_operations netlink_net_ops = {
.init = netlink_net_init, .init = netlink_net_init,
.exit = netlink_net_exit, .exit = netlink_net_exit,
}; };
......
net/rxrpc/rxkad.c
View file @ 0f5a2c55
...@@ -135,9 +135,8 @@ static void rxkad_prime_packet_security(struct rxrpc_connection *conn) ...@@ -135,9 +135,8 @@ static void rxkad_prime_packet_security(struct rxrpc_connection *conn)
tmpbuf.x[2] = 0; tmpbuf.x[2] = 0;
tmpbuf.x[3] = htonl(conn->security_ix); tmpbuf.x[3] = htonl(conn->security_ix);
memset(sg, 0, sizeof(sg)); sg_init_one(&sg[0], &tmpbuf, sizeof(tmpbuf));
sg_set_buf(&sg[0], &tmpbuf, sizeof(tmpbuf)); sg_init_one(&sg[1], &tmpbuf, sizeof(tmpbuf));
sg_set_buf(&sg[1], &tmpbuf, sizeof(tmpbuf));
crypto_blkcipher_encrypt_iv(&desc, &sg[0], &sg[1], sizeof(tmpbuf)); crypto_blkcipher_encrypt_iv(&desc, &sg[0], &sg[1], sizeof(tmpbuf));
memcpy(&conn->csum_iv, &tmpbuf.x[2], sizeof(conn->csum_iv)); memcpy(&conn->csum_iv, &tmpbuf.x[2], sizeof(conn->csum_iv));
...@@ -180,9 +179,8 @@ static int rxkad_secure_packet_auth(const struct rxrpc_call *call, ...@@ -180,9 +179,8 @@ static int rxkad_secure_packet_auth(const struct rxrpc_call *call,
desc.info = iv.x; desc.info = iv.x;
desc.flags = 0; desc.flags = 0;
memset(sg, 0, sizeof(sg)); sg_init_one(&sg[0], &tmpbuf, sizeof(tmpbuf));
sg_set_buf(&sg[0], &tmpbuf, sizeof(tmpbuf)); sg_init_one(&sg[1], &tmpbuf, sizeof(tmpbuf));
sg_set_buf(&sg[1], &tmpbuf, sizeof(tmpbuf));
crypto_blkcipher_encrypt_iv(&desc, &sg[0], &sg[1], sizeof(tmpbuf)); crypto_blkcipher_encrypt_iv(&desc, &sg[0], &sg[1], sizeof(tmpbuf));
memcpy(sechdr, &tmpbuf, sizeof(tmpbuf)); memcpy(sechdr, &tmpbuf, sizeof(tmpbuf));
...@@ -227,9 +225,8 @@ static int rxkad_secure_packet_encrypt(const struct rxrpc_call *call, ...@@ -227,9 +225,8 @@ static int rxkad_secure_packet_encrypt(const struct rxrpc_call *call,
desc.info = iv.x; desc.info = iv.x;
desc.flags = 0; desc.flags = 0;
memset(sg, 0, sizeof(sg[0]) * 2); sg_init_one(&sg[0], sechdr, sizeof(rxkhdr));
sg_set_buf(&sg[0], sechdr, sizeof(rxkhdr)); sg_init_one(&sg[1], &rxkhdr, sizeof(rxkhdr));
sg_set_buf(&sg[1], &rxkhdr, sizeof(rxkhdr));
crypto_blkcipher_encrypt_iv(&desc, &sg[0], &sg[1], sizeof(rxkhdr)); crypto_blkcipher_encrypt_iv(&desc, &sg[0], &sg[1], sizeof(rxkhdr));
/* we want to encrypt the skbuff in-place */ /* we want to encrypt the skbuff in-place */
...@@ -240,7 +237,7 @@ static int rxkad_secure_packet_encrypt(const struct rxrpc_call *call, ...@@ -240,7 +237,7 @@ static int rxkad_secure_packet_encrypt(const struct rxrpc_call *call,
len = data_size + call->conn->size_align - 1; len = data_size + call->conn->size_align - 1;
len &= ~(call->conn->size_align - 1); len &= ~(call->conn->size_align - 1);
skb_to_sgvec(skb, sg, 0, len); sg_init_table(sg, skb_to_sgvec(skb, sg, 0, len));
crypto_blkcipher_encrypt_iv(&desc, sg, sg, len); crypto_blkcipher_encrypt_iv(&desc, sg, sg, len);
_leave(" = 0"); _leave(" = 0");
...@@ -290,9 +287,8 @@ static int rxkad_secure_packet(const struct rxrpc_call *call, ...@@ -290,9 +287,8 @@ static int rxkad_secure_packet(const struct rxrpc_call *call,
tmpbuf.x[0] = sp->hdr.callNumber; tmpbuf.x[0] = sp->hdr.callNumber;
tmpbuf.x[1] = x; tmpbuf.x[1] = x;
memset(&sg, 0, sizeof(sg)); sg_init_one(&sg[0], &tmpbuf, sizeof(tmpbuf));
sg_set_buf(&sg[0], &tmpbuf, sizeof(tmpbuf)); sg_init_one(&sg[1], &tmpbuf, sizeof(tmpbuf));
sg_set_buf(&sg[1], &tmpbuf, sizeof(tmpbuf));
crypto_blkcipher_encrypt_iv(&desc, &sg[0], &sg[1], sizeof(tmpbuf)); crypto_blkcipher_encrypt_iv(&desc, &sg[0], &sg[1], sizeof(tmpbuf));
x = ntohl(tmpbuf.x[1]); x = ntohl(tmpbuf.x[1]);
...@@ -332,20 +328,23 @@ static int rxkad_verify_packet_auth(const struct rxrpc_call *call, ...@@ -332,20 +328,23 @@ static int rxkad_verify_packet_auth(const struct rxrpc_call *call,
struct rxrpc_skb_priv *sp; struct rxrpc_skb_priv *sp;
struct blkcipher_desc desc; struct blkcipher_desc desc;
struct rxrpc_crypt iv; struct rxrpc_crypt iv;
struct scatterlist sg[2]; struct scatterlist sg[16];
struct sk_buff *trailer; struct sk_buff *trailer;
u32 data_size, buf; u32 data_size, buf;
u16 check; u16 check;
int nsg;
_enter(""); _enter("");
sp = rxrpc_skb(skb); sp = rxrpc_skb(skb);
/* we want to decrypt the skbuff in-place */ /* we want to decrypt the skbuff in-place */
if (skb_cow_data(skb, 0, &trailer) < 0) nsg = skb_cow_data(skb, 0, &trailer);
if (nsg < 0 || nsg > 16)
goto nomem; goto nomem;
skb_to_sgvec(skb, sg, 0, 8); sg_init_table(sg, nsg);
sg_mark_end(sg, skb_to_sgvec(skb, sg, 0, 8));
/* start the decryption afresh */ /* start the decryption afresh */
memset(&iv, 0, sizeof(iv)); memset(&iv, 0, sizeof(iv));
...@@ -426,7 +425,8 @@ static int rxkad_verify_packet_encrypt(const struct rxrpc_call *call, ...@@ -426,7 +425,8 @@ static int rxkad_verify_packet_encrypt(const struct rxrpc_call *call,
goto nomem; goto nomem;
} }
skb_to_sgvec(skb, sg, 0, skb->len); sg_init_table(sg, nsg);
sg_mark_end(sg, skb_to_sgvec(skb, sg, 0, skb->len));
/* decrypt from the session key */ /* decrypt from the session key */
payload = call->conn->key->payload.data; payload = call->conn->key->payload.data;
...@@ -521,9 +521,8 @@ static int rxkad_verify_packet(const struct rxrpc_call *call, ...@@ -521,9 +521,8 @@ static int rxkad_verify_packet(const struct rxrpc_call *call,
tmpbuf.x[0] = call->call_id; tmpbuf.x[0] = call->call_id;
tmpbuf.x[1] = x; tmpbuf.x[1] = x;
memset(&sg, 0, sizeof(sg)); sg_init_one(&sg[0], &tmpbuf, sizeof(tmpbuf));
sg_set_buf(&sg[0], &tmpbuf, sizeof(tmpbuf)); sg_init_one(&sg[1], &tmpbuf, sizeof(tmpbuf));
sg_set_buf(&sg[1], &tmpbuf, sizeof(tmpbuf));
crypto_blkcipher_encrypt_iv(&desc, &sg[0], &sg[1], sizeof(tmpbuf)); crypto_blkcipher_encrypt_iv(&desc, &sg[0], &sg[1], sizeof(tmpbuf));
x = ntohl(tmpbuf.x[1]); x = ntohl(tmpbuf.x[1]);
...@@ -690,16 +689,20 @@ static void rxkad_calc_response_checksum(struct rxkad_response *response) ...@@ -690,16 +689,20 @@ static void rxkad_calc_response_checksum(struct rxkad_response *response)
static void rxkad_sg_set_buf2(struct scatterlist sg[2], static void rxkad_sg_set_buf2(struct scatterlist sg[2],
void *buf, size_t buflen) void *buf, size_t buflen)
{ {
int nsg = 1;
memset(sg, 0, sizeof(sg)); sg_init_table(sg, 2);
sg_set_buf(&sg[0], buf, buflen); sg_set_buf(&sg[0], buf, buflen);
if (sg[0].offset + buflen > PAGE_SIZE) { if (sg[0].offset + buflen > PAGE_SIZE) {
/* the buffer was split over two pages */ /* the buffer was split over two pages */
sg[0].length = PAGE_SIZE - sg[0].offset; sg[0].length = PAGE_SIZE - sg[0].offset;
sg_set_buf(&sg[1], buf + sg[0].length, buflen - sg[0].length); sg_set_buf(&sg[1], buf + sg[0].length, buflen - sg[0].length);
nsg++;
} }
sg_mark_end(sg, nsg);
ASSERTCMP(sg[0].length + sg[1].length, ==, buflen); ASSERTCMP(sg[0].length + sg[1].length, ==, buflen);
} }
...@@ -712,7 +715,7 @@ static void rxkad_encrypt_response(struct rxrpc_connection *conn, ...@@ -712,7 +715,7 @@ static void rxkad_encrypt_response(struct rxrpc_connection *conn,
{ {
struct blkcipher_desc desc; struct blkcipher_desc desc;
struct rxrpc_crypt iv; struct rxrpc_crypt iv;
struct scatterlist ssg[2], dsg[2]; struct scatterlist sg[2];
/* continue encrypting from where we left off */ /* continue encrypting from where we left off */
memcpy(&iv, s2->session_key, sizeof(iv)); memcpy(&iv, s2->session_key, sizeof(iv));
...@@ -720,9 +723,8 @@ static void rxkad_encrypt_response(struct rxrpc_connection *conn, ...@@ -720,9 +723,8 @@ static void rxkad_encrypt_response(struct rxrpc_connection *conn,
desc.info = iv.x; desc.info = iv.x;
desc.flags = 0; desc.flags = 0;
rxkad_sg_set_buf2(ssg, &resp->encrypted, sizeof(resp->encrypted)); rxkad_sg_set_buf2(sg, &resp->encrypted, sizeof(resp->encrypted));
memcpy(dsg, ssg, sizeof(dsg)); crypto_blkcipher_encrypt_iv(&desc, sg, sg, sizeof(resp->encrypted));
crypto_blkcipher_encrypt_iv(&desc, dsg, ssg, sizeof(resp->encrypted));
} }
/* /*
...@@ -817,7 +819,7 @@ static int rxkad_decrypt_ticket(struct rxrpc_connection *conn, ...@@ -817,7 +819,7 @@ static int rxkad_decrypt_ticket(struct rxrpc_connection *conn,
{ {
struct blkcipher_desc desc; struct blkcipher_desc desc;
struct rxrpc_crypt iv, key; struct rxrpc_crypt iv, key;
struct scatterlist ssg[1], dsg[1]; struct scatterlist sg[1];
struct in_addr addr; struct in_addr addr;
unsigned life; unsigned life;
time_t issue, now; time_t issue, now;
...@@ -850,9 +852,8 @@ static int rxkad_decrypt_ticket(struct rxrpc_connection *conn, ...@@ -850,9 +852,8 @@ static int rxkad_decrypt_ticket(struct rxrpc_connection *conn,
desc.info = iv.x; desc.info = iv.x;
desc.flags = 0; desc.flags = 0;
sg_init_one(&ssg[0], ticket, ticket_len); sg_init_one(&sg[0], ticket, ticket_len);
memcpy(dsg, ssg, sizeof(dsg)); crypto_blkcipher_decrypt_iv(&desc, sg, sg, ticket_len);
crypto_blkcipher_decrypt_iv(&desc, dsg, ssg, ticket_len);
p = ticket; p = ticket;
end = p + ticket_len; end = p + ticket_len;
...@@ -961,7 +962,7 @@ static void rxkad_decrypt_response(struct rxrpc_connection *conn, ...@@ -961,7 +962,7 @@ static void rxkad_decrypt_response(struct rxrpc_connection *conn,
const struct rxrpc_crypt *session_key) const struct rxrpc_crypt *session_key)
{ {
struct blkcipher_desc desc; struct blkcipher_desc desc;
struct scatterlist ssg[2], dsg[2]; struct scatterlist sg[2];
struct rxrpc_crypt iv; struct rxrpc_crypt iv;
_enter(",,%08x%08x", _enter(",,%08x%08x",
...@@ -979,9 +980,8 @@ static void rxkad_decrypt_response(struct rxrpc_connection *conn, ...@@ -979,9 +980,8 @@ static void rxkad_decrypt_response(struct rxrpc_connection *conn,
desc.info = iv.x; desc.info = iv.x;
desc.flags = 0; desc.flags = 0;
rxkad_sg_set_buf2(ssg, &resp->encrypted, sizeof(resp->encrypted)); rxkad_sg_set_buf2(sg, &resp->encrypted, sizeof(resp->encrypted));
memcpy(dsg, ssg, sizeof(dsg)); crypto_blkcipher_decrypt_iv(&desc, sg, sg, sizeof(resp->encrypted));
crypto_blkcipher_decrypt_iv(&desc, dsg, ssg, sizeof(resp->encrypted));
mutex_unlock(&rxkad_ci_mutex); mutex_unlock(&rxkad_ci_mutex);
_leave(""); _leave("");
......
net/sctp/auth.c
View file @ 0f5a2c55
...@@ -726,8 +726,7 @@ void sctp_auth_calculate_hmac(const struct sctp_association *asoc, ...@@ -726,8 +726,7 @@ void sctp_auth_calculate_hmac(const struct sctp_association *asoc,
/* set up scatter list */ /* set up scatter list */
end = skb_tail_pointer(skb); end = skb_tail_pointer(skb);
sg_init_table(&sg, 1); sg_init_one(&sg, auth, end - (unsigned char *)auth);
sg_set_buf(&sg, auth, end - (unsigned char *)auth);
desc.tfm = asoc->ep->auth_hmacs[hmac_id]; desc.tfm = asoc->ep->auth_hmacs[hmac_id];
desc.flags = 0; desc.flags = 0;
......
net/sctp/sm_make_chunk.c
View file @ 0f5a2c55
...@@ -1513,8 +1513,7 @@ static sctp_cookie_param_t *sctp_pack_cookie(const struct sctp_endpoint *ep, ...@@ -1513,8 +1513,7 @@ static sctp_cookie_param_t *sctp_pack_cookie(const struct sctp_endpoint *ep,
struct hash_desc desc; struct hash_desc desc;
/* Sign the message. */ /* Sign the message. */
sg_init_table(&sg, 1); sg_init_one(&sg, &cookie->c, bodysize);
sg_set_buf(&sg, &cookie->c, bodysize);
keylen = SCTP_SECRET_SIZE; keylen = SCTP_SECRET_SIZE;
key = (char *)ep->secret_key[ep->current_key]; key = (char *)ep->secret_key[ep->current_key];
desc.tfm = sctp_sk(ep->base.sk)->hmac; desc.tfm = sctp_sk(ep->base.sk)->hmac;
...@@ -1584,8 +1583,7 @@ struct sctp_association *sctp_unpack_cookie( ...@@ -1584,8 +1583,7 @@ struct sctp_association *sctp_unpack_cookie(
/* Check the signature. */ /* Check the signature. */
keylen = SCTP_SECRET_SIZE; keylen = SCTP_SECRET_SIZE;
sg_init_table(&sg, 1); sg_init_one(&sg, bear_cookie, bodysize);
sg_set_buf(&sg, bear_cookie, bodysize);
key = (char *)ep->secret_key[ep->current_key]; key = (char *)ep->secret_key[ep->current_key];
desc.tfm = sctp_sk(ep->base.sk)->hmac; desc.tfm = sctp_sk(ep->base.sk)->hmac;
desc.flags = 0; desc.flags = 0;
......
net/sunrpc/auth_gss/gss_krb5_crypto.c
View file @ 0f5a2c55
...@@ -75,7 +75,7 @@ krb5_encrypt( ...@@ -75,7 +75,7 @@ krb5_encrypt(
memcpy(local_iv, iv, crypto_blkcipher_ivsize(tfm)); memcpy(local_iv, iv, crypto_blkcipher_ivsize(tfm));
memcpy(out, in, length); memcpy(out, in, length);
sg_set_buf(sg, out, length); sg_init_one(sg, out, length);
ret = crypto_blkcipher_encrypt_iv(&desc, sg, sg, length); ret = crypto_blkcipher_encrypt_iv(&desc, sg, sg, length);
out: out:
...@@ -110,7 +110,7 @@ krb5_decrypt( ...@@ -110,7 +110,7 @@ krb5_decrypt(
memcpy(local_iv,iv, crypto_blkcipher_ivsize(tfm)); memcpy(local_iv,iv, crypto_blkcipher_ivsize(tfm));
memcpy(out, in, length); memcpy(out, in, length);
sg_set_buf(sg, out, length); sg_init_one(sg, out, length);
ret = crypto_blkcipher_decrypt_iv(&desc, sg, sg, length); ret = crypto_blkcipher_decrypt_iv(&desc, sg, sg, length);
out: out:
...@@ -146,7 +146,7 @@ make_checksum(char *cksumname, char *header, int hdrlen, struct xdr_buf *body, ...@@ -146,7 +146,7 @@ make_checksum(char *cksumname, char *header, int hdrlen, struct xdr_buf *body,
err = crypto_hash_init(&desc); err = crypto_hash_init(&desc);
if (err) if (err)
goto out; goto out;
sg_set_buf(sg, header, hdrlen); sg_init_one(sg, header, hdrlen);
err = crypto_hash_update(&desc, sg, hdrlen); err = crypto_hash_update(&desc, sg, hdrlen);
if (err) if (err)
goto out; goto out;
...@@ -188,8 +188,6 @@ encryptor(struct scatterlist *sg, void *data) ...@@ -188,8 +188,6 @@ encryptor(struct scatterlist *sg, void *data)
/* Worst case is 4 fragments: head, end of page 1, start /* Worst case is 4 fragments: head, end of page 1, start
* of page 2, tail. Anything more is a bug. */ * of page 2, tail. Anything more is a bug. */
BUG_ON(desc->fragno > 3); BUG_ON(desc->fragno > 3);
desc->infrags[desc->fragno] = *sg;
desc->outfrags[desc->fragno] = *sg;
page_pos = desc->pos - outbuf->head[0].iov_len; page_pos = desc->pos - outbuf->head[0].iov_len;
if (page_pos >= 0 && page_pos < outbuf->page_len) { if (page_pos >= 0 && page_pos < outbuf->page_len) {
...@@ -199,7 +197,10 @@ encryptor(struct scatterlist *sg, void *data) ...@@ -199,7 +197,10 @@ encryptor(struct scatterlist *sg, void *data)
} else { } else {
in_page = sg_page(sg); in_page = sg_page(sg);
} }
sg_assign_page(&desc->infrags[desc->fragno], in_page); sg_set_page(&desc->infrags[desc->fragno], in_page, sg->length,
sg->offset);
sg_set_page(&desc->outfrags[desc->fragno], sg_page(sg), sg->length,
sg->offset);
desc->fragno++; desc->fragno++;
desc->fraglen += sg->length; desc->fraglen += sg->length;
desc->pos += sg->length; desc->pos += sg->length;
...@@ -210,10 +211,17 @@ encryptor(struct scatterlist *sg, void *data) ...@@ -210,10 +211,17 @@ encryptor(struct scatterlist *sg, void *data)
if (thislen == 0) if (thislen == 0)
return 0; return 0;
sg_mark_end(desc->infrags, desc->fragno);
sg_mark_end(desc->outfrags, desc->fragno);
ret = crypto_blkcipher_encrypt_iv(&desc->desc, desc->outfrags, ret = crypto_blkcipher_encrypt_iv(&desc->desc, desc->outfrags,
desc->infrags, thislen); desc->infrags, thislen);
if (ret) if (ret)
return ret; return ret;
sg_init_table(desc->infrags, 4);
sg_init_table(desc->outfrags, 4);
if (fraglen) { if (fraglen) {
sg_set_page(&desc->outfrags[0], sg_page(sg), fraglen, sg_set_page(&desc->outfrags[0], sg_page(sg), fraglen,
sg->offset + sg->length - fraglen); sg->offset + sg->length - fraglen);
...@@ -247,6 +255,9 @@ gss_encrypt_xdr_buf(struct crypto_blkcipher *tfm, struct xdr_buf *buf, ...@@ -247,6 +255,9 @@ gss_encrypt_xdr_buf(struct crypto_blkcipher *tfm, struct xdr_buf *buf,
desc.fragno = 0; desc.fragno = 0;
desc.fraglen = 0; desc.fraglen = 0;
sg_init_table(desc.infrags, 4);
sg_init_table(desc.outfrags, 4);
ret = xdr_process_buf(buf, offset, buf->len - offset, encryptor, &desc); ret = xdr_process_buf(buf, offset, buf->len - offset, encryptor, &desc);
return ret; return ret;
} }
...@@ -271,7 +282,8 @@ decryptor(struct scatterlist *sg, void *data) ...@@ -271,7 +282,8 @@ decryptor(struct scatterlist *sg, void *data)
/* Worst case is 4 fragments: head, end of page 1, start /* Worst case is 4 fragments: head, end of page 1, start
* of page 2, tail. Anything more is a bug. */ * of page 2, tail. Anything more is a bug. */
BUG_ON(desc->fragno > 3); BUG_ON(desc->fragno > 3);
desc->frags[desc->fragno] = *sg; sg_set_page(&desc->frags[desc->fragno], sg_page(sg), sg->length,
sg->offset);
desc->fragno++; desc->fragno++;
desc->fraglen += sg->length; desc->fraglen += sg->length;
...@@ -281,10 +293,15 @@ decryptor(struct scatterlist *sg, void *data) ...@@ -281,10 +293,15 @@ decryptor(struct scatterlist *sg, void *data)
if (thislen == 0) if (thislen == 0)
return 0; return 0;
sg_mark_end(desc->frags, desc->fragno);
ret = crypto_blkcipher_decrypt_iv(&desc->desc, desc->frags, ret = crypto_blkcipher_decrypt_iv(&desc->desc, desc->frags,
desc->frags, thislen); desc->frags, thislen);
if (ret) if (ret)
return ret; return ret;
sg_init_table(desc->frags, 4);
if (fraglen) { if (fraglen) {
sg_set_page(&desc->frags[0], sg_page(sg), fraglen, sg_set_page(&desc->frags[0], sg_page(sg), fraglen,
sg->offset + sg->length - fraglen); sg->offset + sg->length - fraglen);
...@@ -312,6 +329,9 @@ gss_decrypt_xdr_buf(struct crypto_blkcipher *tfm, struct xdr_buf *buf, ...@@ -312,6 +329,9 @@ gss_decrypt_xdr_buf(struct crypto_blkcipher *tfm, struct xdr_buf *buf,
desc.desc.flags = 0; desc.desc.flags = 0;
desc.fragno = 0; desc.fragno = 0;
desc.fraglen = 0; desc.fraglen = 0;
sg_init_table(desc.frags, 4);
return xdr_process_buf(buf, offset, buf->len - offset, decryptor, &desc); return xdr_process_buf(buf, offset, buf->len - offset, decryptor, &desc);
} }
......
net/sunrpc/auth_gss/gss_spkm3_seal.c
View file @ 0f5a2c55
...@@ -173,7 +173,7 @@ make_spkm3_checksum(s32 cksumtype, struct xdr_netobj *key, char *header, ...@@ -173,7 +173,7 @@ make_spkm3_checksum(s32 cksumtype, struct xdr_netobj *key, char *header,
if (err) if (err)
goto out; goto out;
sg_set_buf(sg, header, hdrlen); sg_init_one(sg, header, hdrlen);
crypto_hash_update(&desc, sg, sg->length); crypto_hash_update(&desc, sg, sg->length);
xdr_process_buf(body, body_offset, body->len - body_offset, xdr_process_buf(body, body_offset, body->len - body_offset,
......
net/sunrpc/xdr.c
View file @ 0f5a2c55
...@@ -1030,6 +1030,8 @@ xdr_process_buf(struct xdr_buf *buf, unsigned int offset, unsigned int len, ...@@ -1030,6 +1030,8 @@ xdr_process_buf(struct xdr_buf *buf, unsigned int offset, unsigned int len,
unsigned page_len, thislen, page_offset; unsigned page_len, thislen, page_offset;
struct scatterlist sg[1]; struct scatterlist sg[1];
sg_init_table(sg, 1);
if (offset >= buf->head[0].iov_len) { if (offset >= buf->head[0].iov_len) {
offset -= buf->head[0].iov_len; offset -= buf->head[0].iov_len;
} else { } else {
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7