[patch] eCryptfs: remove unneeded checks in virt_to_scatterlist()

[patch] eCryptfs: remove unneeded checks in virt_to_scatterlist()

[Dan Carpenter]

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>

diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index a7b0c2d..d5c25db 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,
 	while (size > 0 && i < sg_size) {
 		pg = virt_to_page(addr);
 		offset = offset_in_page(addr);
-		if (sg)
-			sg_set_page(&sg[i], pg, 0, offset);
+		sg_set_page(&sg[i], pg, 0, offset);
 		remainder_of_page = PAGE_CACHE_SIZE - offset;
 		if (size >= remainder_of_page) {
-			if (sg)
-				sg[i].length = remainder_of_page;
+			sg[i].length = remainder_of_page;
 			addr += remainder_of_page;
 			size -= remainder_of_page;
 		} else {
-			if (sg)
-				sg[i].length = size;
+			sg[i].length = size;
 			addr += size;
 			size = 0;
 		}

Re: [patch] eCryptfs: remove unneeded checks in virt_to_scatterlist()

[Tyler Hicks]

[-- Attachment #1: Type: text/plain, Size: 1223 bytes --]

On 2013-01-26 10:48:42, Dan Carpenter wrote:
> 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>

Thanks, Dan! I've tested and pushed this patch to the eCryptfs next
branch.

Tyler

> 
> diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
> index a7b0c2d..d5c25db 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,
>  	while (size > 0 && i < sg_size) {
>  		pg = virt_to_page(addr);
>  		offset = offset_in_page(addr);
> -		if (sg)
> -			sg_set_page(&sg[i], pg, 0, offset);
> +		sg_set_page(&sg[i], pg, 0, offset);
>  		remainder_of_page = PAGE_CACHE_SIZE - offset;
>  		if (size >= remainder_of_page) {
> -			if (sg)
> -				sg[i].length = remainder_of_page;
> +			sg[i].length = remainder_of_page;
>  			addr += remainder_of_page;
>  			size -= remainder_of_page;
>  		} else {
> -			if (sg)
> -				sg[i].length = size;
> +			sg[i].length = size;
>  			addr += size;
>  			size = 0;
>  		}

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]