From patchwork Fri Jan 22 14:12:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 368662 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp1761440jam; Fri, 22 Jan 2021 10:43:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJyb2BXWj6T8OxcFS89yKZqgsDclr29/IEom6ytFguyfFqSMkpfSY9cKDZUCfZwas/XM0zZh X-Received: by 2002:a17:906:e84:: with SMTP id p4mr3972461ejf.141.1611341001307; Fri, 22 Jan 2021 10:43:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611341001; cv=none; d=google.com; s=arc-20160816; b=gUaoAsZpFhaGKMYL8yrx/VdPCIIeVtVey1q8j8NVcJz9+3yZVWiE7Ge78NyYbOCpCO xauu/pYVPNGLQyWTePoE2nr9yrQfcPRFijyeTJic7aRNgGLnbi9JPWsgOvEmBU7c6vXm Em+RLBnvWY/0t4EVfV7ykORi8kfjNNXI71PAsT0FQk5eYOXm/w+tenieJNrimdEHVNfi hoONdWI1ynVrVTLwUnWLqgOG0dCcb3chJYxBVyQh3XtEWWEUpFah7nb64xYAE0HlCeRN JrYumEnsY1bDI3hQHRfjKJIgOgLgFZa2TbMY+vceCZCvH8kSWC59Dscy+9enAg3Q3yGO oQWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=vWBI1ihjpOAgKmCI0uc7LVi1mEHFqumrTfiU2PQMynA=; b=mGZcesmh/qnIz3TyrWjZSybvgx5kvAIYOqV9OmN/XT7VoSccImapqJomxaKuosI02B st0FjI0uCo8Cn9GsrTJhapAM5SCx/r2yBFU0WecB3EEjMUrQvDkvcUWDTiio3rv7u8GH whffi28mromxfvXXNqbGa0tRU84/CIzQqRV2dPplGauLGrcT0CdLN7iBAfrLyRIWysc5 hShUvvrSaZsHp0nyS9W9JM5wlJcOEGqXEhjqNw7x1fPA6WQmaSXXnQMgElBxkPN7k+IT bw76O6baHxMQv2QFSr0ueb1z/X9FEU7TQb0KMQAWTrTERE7S+XhZwFIKvUzu/UtpByye 7aiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Kb9b8yFz; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ia3si3164114ejc.39.2021.01.22.10.43.21; Fri, 22 Jan 2021 10:43:21 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Kb9b8yFz; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729687AbhAVSmx (ORCPT + 13 others); Fri, 22 Jan 2021 13:42:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:38816 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728526AbhAVOWB (ORCPT ); Fri, 22 Jan 2021 09:22:01 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 83FA123B4B; Fri, 22 Jan 2021 14:15:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1611324960; bh=IiIscfHhCqdcjwH5xQw1Itg+sTThc7rQI0Q+rNAvJ0g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kb9b8yFzseQ2kVMpzpVVw0slqGMhFzoOLK1GQaCMs9WSRdnP3z8/XONjAQpn9Uz9N ZiTiNqLKWX6/HnpYxrU8yl1Xc4MazQKUPWQeMQIOb64oh7SuoZpTjNlFzERlgmrHic VHDch3W9Huw/YscOOG+DGpLQAgPmgTXdvuaKy1nA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Jason A. Donenfeld" , "David S. Miller" Subject: [PATCH 4.19 20/22] net: skbuff: disambiguate argument and member for skb_list_walk_safe helper Date: Fri, 22 Jan 2021 15:12:38 +0100 Message-Id: <20210122135732.711507800@linuxfoundation.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210122135731.921636245@linuxfoundation.org> References: <20210122135731.921636245@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jason A. Donenfeld commit 5eee7bd7e245914e4e050c413dfe864e31805207 upstream. This worked before, because we made all callers name their next pointer "next". But in trying to be more "drop-in" ready, the silliness here is revealed. This commit fixes the problem by making the macro argument and the member use different names. Signed-off-by: Jason A. Donenfeld Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- include/linux/skbuff.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1364,9 +1364,9 @@ static inline void skb_mark_not_on_list( } /* Iterate through singly-linked GSO fragments of an skb. */ -#define skb_list_walk_safe(first, skb, next) \ - for ((skb) = (first), (next) = (skb) ? (skb)->next : NULL; (skb); \ - (skb) = (next), (next) = (skb) ? (skb)->next : NULL) +#define skb_list_walk_safe(first, skb, next_skb) \ + for ((skb) = (first), (next_skb) = (skb) ? (skb)->next : NULL; (skb); \ + (skb) = (next_skb), (next_skb) = (skb) ? (skb)->next : NULL) static inline void skb_list_del_init(struct sk_buff *skb) {