Skip to contentSkip to conversation

crypto: chcr - checking for IS_ERR() instead of NULL

PATCH In review Dan Carpenter 3 participants 4 messages Dec 1, 2016 – Dec 7, 2016

Subsystems (3)
Kernel janitors Crypto API CXGB4 crypto driver (chcr)
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 crypto: chcr - checking for IS_ERR() instead of NULL

The create_hash_wr() function never returns error pointers. It returns NULL on error.

Fixes 358961d1cd1e ("crypto: chcr - Added new structure chcr_wr")
Signed-off-by Dan Carpenter <[email protected]>
drivers/crypto/chelsio/chcr_algo.c +8 -9
index 32361dd..2ed1e24 100644
@@ -958,9 +958,8 @@ static int chcr_ahash_update(struct ahash_request *req)
 	req_ctx->result = 0;
 	req_ctx->data_len += params.sg_len + params.bfr_len;
 	skb = create_hash_wr(req, &params);
-
-	if (IS_ERR(skb))
-		return PTR_ERR(skb);
+	if (!skb)
+		return -ENOMEM;
 
 	if (remainder) {
 		u8 *temp;

@@ -1023,8 +1022,8 @@ static int chcr_ahash_final(struct ahash_request *req)
 		params.more = 0;
 	}
 	skb = create_hash_wr(req, &params);
-	if (IS_ERR(skb))
-		return PTR_ERR(skb);
+	if (!skb)
+		return -ENOMEM;
 
 	skb->dev = u_ctx->lldi.ports[0];
 	set_wr_txq(skb, CPL_PRIORITY_DATA, ctx->tx_channel_id);

@@ -1074,8 +1073,8 @@ static int chcr_ahash_finup(struct ahash_request *req)
 	}
 
 	skb = create_hash_wr(req, &params);
-	if (IS_ERR(skb))
-		return PTR_ERR(skb);
+	if (!skb)
+		return -ENOMEM;
 
 	skb->dev = u_ctx->lldi.ports[0];
 	set_wr_txq(skb, CPL_PRIORITY_DATA, ctx->tx_channel_id);

@@ -1125,8 +1124,8 @@ static int chcr_ahash_digest(struct ahash_request *req)
 	}
 
 	skb = create_hash_wr(req, &params);
-	if (IS_ERR(skb))
-		return PTR_ERR(skb);
+	if (!skb)
+		return -ENOMEM;
 
 	skb->dev = u_ctx->lldi.ports[0];
 	set_wr_txq(skb, CPL_PRIORITY_DATA, ctx->tx_channel_id);
#1 lore raw
Quoted 2 lines · Dan Carpenter

The create_hash_wr() function never returns error pointers. It returns NULL on error.

Will fix the same, Thanks

Quoted 53 lines
Fixes 358961d1cd1e ("crypto: chcr - Added new structure chcr_wr")
Signed-off-by Dan Carpenter <[email protected]>
drivers/crypto/chelsio/chcr_algo.c +8 -9
index 32361dd..2ed1e24 100644
@@ -958,9 +958,8 @@ static int chcr_ahash_update(struct ahash_request *req)
 	req_ctx->result = 0;
 	req_ctx->data_len += params.sg_len + params.bfr_len;
 	skb = create_hash_wr(req, &params);
-
-	if (IS_ERR(skb))
-		return PTR_ERR(skb);
+	if (!skb)
+		return -ENOMEM;
 
 	if (remainder) {
 		u8 *temp;

@@ -1023,8 +1022,8 @@ static int chcr_ahash_final(struct ahash_request *req)
 		params.more = 0;
 	}
 	skb = create_hash_wr(req, &params);
-	if (IS_ERR(skb))
-		return PTR_ERR(skb);
+	if (!skb)
+		return -ENOMEM;
 
 	skb->dev = u_ctx->lldi.ports[0];
 	set_wr_txq(skb, CPL_PRIORITY_DATA, ctx->tx_channel_id);

@@ -1074,8 +1073,8 @@ static int chcr_ahash_finup(struct ahash_request *req)
 	}
 
 	skb = create_hash_wr(req, &params);
-	if (IS_ERR(skb))
-		return PTR_ERR(skb);
+	if (!skb)
+		return -ENOMEM;
 
 	skb->dev = u_ctx->lldi.ports[0];
 	set_wr_txq(skb, CPL_PRIORITY_DATA, ctx->tx_channel_id);

@@ -1125,8 +1124,8 @@ static int chcr_ahash_digest(struct ahash_request *req)
 	}
 
 	skb = create_hash_wr(req, &params);
-	if (IS_ERR(skb))
-		return PTR_ERR(skb);
+	if (!skb)
+		return -ENOMEM;
 
 	skb->dev = u_ctx->lldi.ports[0];
 	set_wr_txq(skb, CPL_PRIORITY_DATA, ctx->tx_channel_id);
#2 lore raw
Quoted 5 lines · Harsh Jain
Quoted 2 lines · Dan Carpenter

The create_hash_wr() function never returns error pointers. It returns NULL on error.

Will fix the same, Thanks

It's a patch mail not bug reporting! Sorry for confusion. You have already fixed it. Thanks.

Quoted 52 lines
Quoted 52 lines
Fixes 358961d1cd1e ("crypto: chcr - Added new structure chcr_wr")
Signed-off-by Dan Carpenter <[email protected]>
drivers/crypto/chelsio/chcr_algo.c +8 -9
index 32361dd..2ed1e24 100644
@@ -958,9 +958,8 @@ static int chcr_ahash_update(struct ahash_request *req)
 	req_ctx->result = 0;
 	req_ctx->data_len += params.sg_len + params.bfr_len;
 	skb = create_hash_wr(req, &params);
-
-	if (IS_ERR(skb))
-		return PTR_ERR(skb);
+	if (!skb)
+		return -ENOMEM;
 
 	if (remainder) {
 		u8 *temp;

@@ -1023,8 +1022,8 @@ static int chcr_ahash_final(struct ahash_request *req)
 		params.more = 0;
 	}
 	skb = create_hash_wr(req, &params);
-	if (IS_ERR(skb))
-		return PTR_ERR(skb);
+	if (!skb)
+		return -ENOMEM;
 
 	skb->dev = u_ctx->lldi.ports[0];
 	set_wr_txq(skb, CPL_PRIORITY_DATA, ctx->tx_channel_id);

@@ -1074,8 +1073,8 @@ static int chcr_ahash_finup(struct ahash_request *req)
 	}
 
 	skb = create_hash_wr(req, &params);
-	if (IS_ERR(skb))
-		return PTR_ERR(skb);
+	if (!skb)
+		return -ENOMEM;
 
 	skb->dev = u_ctx->lldi.ports[0];
 	set_wr_txq(skb, CPL_PRIORITY_DATA, ctx->tx_channel_id);

@@ -1125,8 +1124,8 @@ static int chcr_ahash_digest(struct ahash_request *req)
 	}
 
 	skb = create_hash_wr(req, &params);
-	if (IS_ERR(skb))
-		return PTR_ERR(skb);
+	if (!skb)
+		return -ENOMEM;
 
 	skb->dev = u_ctx->lldi.ports[0];
 	set_wr_txq(skb, CPL_PRIORITY_DATA, ctx->tx_channel_id);
maintainer
#3 lore raw
In reply to Dan Carpenter
Quoted 5 lines · Dan Carpenter

The create_hash_wr() function never returns error pointers. It returns NULL on error.

Fixes 358961d1cd1e ("crypto: chcr - Added new structure chcr_wr")
Signed-off-by Dan Carpenter <[email protected]>

Patch applied. Thanks.

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt