[PATCH net-next] net: remove redundant check in skb_shift()

Zhang Changzhong posted 1 patch 1 year, 5 months ago
net/core/skbuff.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
[PATCH net-next] net: remove redundant check in skb_shift()
Posted by Zhang Changzhong 1 year, 5 months ago
The check for '!to' is redundant here, since skb_can_coalesce() already
contains this check.

Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
---
 net/core/skbuff.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 83f8cd8..f915234 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -4169,8 +4169,7 @@ int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen)
 	/* Actual merge is delayed until the point when we know we can
 	 * commit all, so that we don't have to undo partial changes
 	 */
-	if (!to ||
-	    !skb_can_coalesce(tgt, to, skb_frag_page(fragfrom),
+	if (!skb_can_coalesce(tgt, to, skb_frag_page(fragfrom),
 			      skb_frag_off(fragfrom))) {
 		merge = -1;
 	} else {
-- 
2.9.5
Re: [PATCH net-next] net: remove redundant check in skb_shift()
Posted by Simon Horman 1 year, 5 months ago
On Thu, Aug 15, 2024 at 10:09:42PM +0800, Zhang Changzhong wrote:
> The check for '!to' is redundant here, since skb_can_coalesce() already
> contains this check.

It would be nice to mention here how this was found (e.g. found by
inspection, flagged by private static analysis tool, ...) and how it was
tested (e.g. compile tested only).

> Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>

In any case, this looks good to me.

Reviewed-by: Simon Horman <horms@kernel.org>