Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8FAA9C33CAF for ; Mon, 13 Jan 2020 23:43:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 57C4E2080D for ; Mon, 13 Jan 2020 23:43:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b="ko0kmr7Q" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729248AbgAMXnC (ORCPT ); Mon, 13 Jan 2020 18:43:02 -0500 Received: from frisell.zx2c4.com ([192.95.5.64]:55249 "EHLO frisell.zx2c4.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729236AbgAMXnA (ORCPT ); Mon, 13 Jan 2020 18:43:00 -0500 Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTP id f3c65720; Mon, 13 Jan 2020 22:42:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=zx2c4.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=mail; bh=dV/9ypqPU0loa5AZnhX0lQcT2 OY=; b=ko0kmr7QFv4tP6TDHFbziU4Rkng32He06KpzSxDUNXPgDCxHEUgw3vvvm EjhHFfRcaQJUtw7Vm1nP+cqz0Kyjdt/ehAab9k2BJDzeknMD6OYLW71q8QYU2fL/ jqlwjJJCumitaSqZJaIPs6+xEvpDH5jht32tq4tDB3JtTVj4TcEYi6fdMQ5RMPMs eCkstjXsVZI0EpKUX597/JM7dwegmVM9AoaOyQgf+5AOu3K7CGuUkfHYf5E1DLru KFl1y0Ul2QfPPlDYp+bOuHbUz5lGgzNsBpicYHKSNilLdNISMhgR7nqJKF52PqpV 8hHpDB54nEasmsAT8bD/rDHRFQPwA== Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id e38220c5 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Mon, 13 Jan 2020 22:42:58 +0000 (UTC) From: "Jason A. Donenfeld" To: davem@davemloft.net, johannes@sipsolutions.net, netdev@vger.kernel.org Cc: "Jason A. Donenfeld" Subject: [PATCH net-next 7/8] net: netfilter: use skb_list_walk_safe helper for gso segments Date: Mon, 13 Jan 2020 18:42:32 -0500 Message-Id: <20200113234233.33886-8-Jason@zx2c4.com> In-Reply-To: <20200113234233.33886-1-Jason@zx2c4.com> References: <20200113234233.33886-1-Jason@zx2c4.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This is a straight-forward conversion case for the new function, keeping the flow of the existing code as intact as possible. Signed-off-by: Jason A. Donenfeld --- net/netfilter/nfnetlink_queue.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c index feabdfb22920..76535fd9278c 100644 --- a/net/netfilter/nfnetlink_queue.c +++ b/net/netfilter/nfnetlink_queue.c @@ -778,7 +778,7 @@ nfqnl_enqueue_packet(struct nf_queue_entry *entry, unsigned int queuenum) { unsigned int queued; struct nfqnl_instance *queue; - struct sk_buff *skb, *segs; + struct sk_buff *skb, *segs, *nskb; int err = -ENOBUFS; struct net *net = entry->state.net; struct nfnl_queue_net *q = nfnl_queue_pernet(net); @@ -815,8 +815,7 @@ nfqnl_enqueue_packet(struct nf_queue_entry *entry, unsigned int queuenum) goto out_err; queued = 0; err = 0; - do { - struct sk_buff *nskb = segs->next; + skb_list_walk_safe(segs, segs, nskb) { if (err == 0) err = __nfqnl_enqueue_packet_gso(net, queue, segs, entry); @@ -824,8 +823,7 @@ nfqnl_enqueue_packet(struct nf_queue_entry *entry, unsigned int queuenum) queued++; else kfree_skb(segs); - segs = nskb; - } while (segs); + } if (queued) { if (err) /* some segments are already queued */ -- 2.24.1