android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[NET]: Annotate callers of csum_partial_copy_...() and csum_and_copy...() in net/*

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Al Viro 2006-11-14 21:36:34 -08:00 committed by David S. Miller
parent 44bb93633f
commit 5084205faf
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/skbuff.h
View File

@ -1199,8 +1199,7 @@ static inline int skb_add_data(struct sk_buff *skb,
if (skb->ip_summed == CHECKSUM_NONE) { if (skb->ip_summed == CHECKSUM_NONE) {
int err = 0; int err = 0;
unsigned int csum = csum_and_copy_from_user(from, __wsum csum = csum_and_copy_from_user(from, skb_put(skb, copy),
skb_put(skb, copy),
copy, 0, &err); copy, 0, &err);
if (!err) { if (!err) {
skb->csum = csum_block_add(skb->csum, csum, off); skb->csum = csum_block_add(skb->csum, csum, off);

2
include/net/sock.h
View File

@ -1088,7 +1088,7 @@ static inline int skb_copy_to_page(struct sock *sk, char __user *from,
{ {
if (skb->ip_summed == CHECKSUM_NONE) { if (skb->ip_summed == CHECKSUM_NONE) {
int err = 0; int err = 0;
unsigned int csum = csum_and_copy_from_user(from, __wsum csum = csum_and_copy_from_user(from,
page_address(page) + off, page_address(page) + off,
copy, 0, &err); copy, 0, &err);
if (err) if (err)

6
net/core/datagram.c
View File

@ -321,7 +321,7 @@ int skb_copy_datagram_iovec(const struct sk_buff *skb, int offset,
static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset, static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset,
u8 __user *to, int len, u8 __user *to, int len,
unsigned int *csump) __wsum *csump)
{ {
int start = skb_headlen(skb); int start = skb_headlen(skb);
int pos = 0; int pos = 0;
@ -350,7 +350,7 @@ static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset,
end = start + skb_shinfo(skb)->frags[i].size; end = start + skb_shinfo(skb)->frags[i].size;
if ((copy = end - offset) > 0) { if ((copy = end - offset) > 0) {
unsigned int csum2; __wsum csum2;
int err = 0; int err = 0;
u8 *vaddr; u8 *vaddr;
skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
@ -386,7 +386,7 @@ static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset,
end = start + list->len; end = start + list->len;
if ((copy = end - offset) > 0) { if ((copy = end - offset) > 0) {
unsigned int csum2 = 0; __wsum csum2 = 0;
if (copy > len) if (copy > len)
copy = len; copy = len;
if (skb_copy_and_csum_datagram(list, if (skb_copy_and_csum_datagram(list,

2
net/core/skbuff.c
View File

@ -1342,7 +1342,7 @@ unsigned int skb_copy_and_csum_bits(const struct sk_buff *skb, int offset,
end = start + skb_shinfo(skb)->frags[i].size; end = start + skb_shinfo(skb)->frags[i].size;
if ((copy = end - offset) > 0) { if ((copy = end - offset) > 0) {
unsigned int csum2; __wsum csum2;
u8 *vaddr; u8 *vaddr;
skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; skb_frag_t *frag = &skb_shinfo(skb)->frags[i];

2
net/ipv4/ip_output.c
View File

@ -1314,7 +1314,7 @@ void ip_flush_pending_frames(struct sock *sk)
static int ip_reply_glue_bits(void *dptr, char *to, int offset, static int ip_reply_glue_bits(void *dptr, char *to, int offset,
int len, int odd, struct sk_buff *skb) int len, int odd, struct sk_buff *skb)
{ {
unsigned int csum; __wsum csum;
csum = csum_partial_copy_nocheck(dptr+offset, to, len, 0); csum = csum_partial_copy_nocheck(dptr+offset, to, len, 0);
skb->csum = csum_block_add(skb->csum, csum, odd); skb->csum = csum_block_add(skb->csum, csum, odd);