diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-01-26 02:48:42 -0500 |
---|---|---|
committer | Tyler Hicks <tyhicks@canonical.com> | 2013-01-28 19:38:37 -0500 |
commit | a07c48ad5be5cbf32a2741f10e6fbf4bbfcaa362 (patch) | |
tree | 46f3dfab951daefbbb4dc74580cb364ac44cff27 /fs | |
parent | 111d61a25ec11c1837ac0fd81bf4b845d3327fb7 (diff) |
eCryptfs: remove unneeded checks in virt_to_scatterlist()
This is always called with a valid "sg" pointer. My static checker
complains because the call to sg_init_table() dereferences "sg" before
we reach the checks.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ecryptfs/crypto.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c index a7b0c2dfb3db..d5c25db4398f 100644 --- a/fs/ecryptfs/crypto.c +++ b/fs/ecryptfs/crypto.c | |||
@@ -301,17 +301,14 @@ int virt_to_scatterlist(const void *addr, int size, struct scatterlist *sg, | |||
301 | while (size > 0 && i < sg_size) { | 301 | while (size > 0 && i < sg_size) { |
302 | pg = virt_to_page(addr); | 302 | pg = virt_to_page(addr); |
303 | offset = offset_in_page(addr); | 303 | offset = offset_in_page(addr); |
304 | if (sg) | 304 | sg_set_page(&sg[i], pg, 0, offset); |
305 | sg_set_page(&sg[i], pg, 0, offset); | ||
306 | remainder_of_page = PAGE_CACHE_SIZE - offset; | 305 | remainder_of_page = PAGE_CACHE_SIZE - offset; |
307 | if (size >= remainder_of_page) { | 306 | if (size >= remainder_of_page) { |
308 | if (sg) | 307 | sg[i].length = remainder_of_page; |
309 | sg[i].length = remainder_of_page; | ||
310 | addr += remainder_of_page; | 308 | addr += remainder_of_page; |
311 | size -= remainder_of_page; | 309 | size -= remainder_of_page; |
312 | } else { | 310 | } else { |
313 | if (sg) | 311 | sg[i].length = size; |
314 | sg[i].length = size; | ||
315 | addr += size; | 312 | addr += size; |
316 | size = 0; | 313 | size = 0; |
317 | } | 314 | } |