diff options
Diffstat (limited to 'net/core/iovec.c')
-rw-r--r-- | net/core/iovec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/core/iovec.c b/net/core/iovec.c index 04b249c40b5..4fb1cb9b79b 100644 --- a/net/core/iovec.c +++ b/net/core/iovec.c | |||
@@ -40,7 +40,7 @@ | |||
40 | int verify_iovec(struct msghdr *m, struct iovec *iov, char *address, int mode) | 40 | int verify_iovec(struct msghdr *m, struct iovec *iov, char *address, int mode) |
41 | { | 41 | { |
42 | int size, err, ct; | 42 | int size, err, ct; |
43 | 43 | ||
44 | if (m->msg_namelen) { | 44 | if (m->msg_namelen) { |
45 | if (mode == VERIFY_READ) { | 45 | if (mode == VERIFY_READ) { |
46 | err = move_addr_to_kernel(m->msg_name, m->msg_namelen, | 46 | err = move_addr_to_kernel(m->msg_name, m->msg_namelen, |
@@ -79,7 +79,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, char *address, int mode) | |||
79 | * | 79 | * |
80 | * Note: this modifies the original iovec. | 80 | * Note: this modifies the original iovec. |
81 | */ | 81 | */ |
82 | 82 | ||
83 | int memcpy_toiovec(struct iovec *iov, unsigned char *kdata, int len) | 83 | int memcpy_toiovec(struct iovec *iov, unsigned char *kdata, int len) |
84 | { | 84 | { |
85 | while (len > 0) { | 85 | while (len > 0) { |
@@ -103,7 +103,7 @@ int memcpy_toiovec(struct iovec *iov, unsigned char *kdata, int len) | |||
103 | * | 103 | * |
104 | * Note: this modifies the original iovec. | 104 | * Note: this modifies the original iovec. |
105 | */ | 105 | */ |
106 | 106 | ||
107 | int memcpy_fromiovec(unsigned char *kdata, struct iovec *iov, int len) | 107 | int memcpy_fromiovec(unsigned char *kdata, struct iovec *iov, int len) |
108 | { | 108 | { |
109 | while (len > 0) { | 109 | while (len > 0) { |
@@ -209,7 +209,7 @@ int csum_partial_copy_fromiovecend(unsigned char *kdata, struct iovec *iov, | |||
209 | if (partial_cnt) { | 209 | if (partial_cnt) { |
210 | copy -= partial_cnt; | 210 | copy -= partial_cnt; |
211 | if (copy_from_user(kdata + copy, base + copy, | 211 | if (copy_from_user(kdata + copy, base + copy, |
212 | partial_cnt)) | 212 | partial_cnt)) |
213 | goto out_fault; | 213 | goto out_fault; |
214 | } | 214 | } |
215 | } | 215 | } |
@@ -224,7 +224,7 @@ int csum_partial_copy_fromiovecend(unsigned char *kdata, struct iovec *iov, | |||
224 | kdata += copy + partial_cnt; | 224 | kdata += copy + partial_cnt; |
225 | iov++; | 225 | iov++; |
226 | } | 226 | } |
227 | *csump = csum; | 227 | *csump = csum; |
228 | out: | 228 | out: |
229 | return err; | 229 | return err; |
230 | 230 | ||