From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B2B384F405B; Wed, 30 Sep 2026 13:54:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790776506; cv=none; b=AcYzRnJaUCiQkURSLVKqCMQSPUF2LqGtRmPfQAFBLogSXkz4oD6LeYWiJKIXGTYjQqJeiWB6eWk/yPMkSi2TufxgTRHTo4QGdiSM3uqPBxI4dqu018fciit4SJ8Xv8k1uyzP+i54wmUhEvjTiN020KHWMJLS2gKaO8NyqlwNKUM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790776506; c=relaxed/simple; bh=80X/ZPX6ZbpEtzgyYZENaORaMrF1uKZ1IdlrN2H5ycY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kRyltzdqiTbRJAaf7Zbx2NoXCt1ahq8WiOqced0dC1sXafJv7dnDclwBKlYkiW666d6ZJfxd1rrLkEx8ZaxKWCp8n9B1FHjrlFaNV3HcOKPFnwVBIG35dh7SmOOqJQKfIkX6k/CEzm7XBq8grjOip1XrCcAo+RdAVlVkJOFOQJo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=ZvIGA147; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=ncODAwp1; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=vgF0nzHD; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=DU0yvjhr; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="ZvIGA147"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="ncODAwp1"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="vgF0nzHD"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="DU0yvjhr" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 526E41F8D6; Wed, 30 Sep 2026 13:54:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1790776484; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qo1mK+6exvY7ym1r/42jk9cIkBabDPh0YPHsTGPBx7Y=; b=ZvIGA147WnxobW9BNNiEpLsyYogzprA0Fqepw8jEz7/fDBymzdR99vsCSCRNBH7MU+tKmM rtZc+4ABSRAUj5V1wEaFAb1dK1y2D5eC62Cgy5zIshA5CR6uF+P9kxSbRAd4VqJSQUKq5Q BjQ44lsWvxHpiWPRBU+Cyl9cfD5SSzU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1790776484; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qo1mK+6exvY7ym1r/42jk9cIkBabDPh0YPHsTGPBx7Y=; b=ncODAwp1sVaRlLXeg+eSs3ig1qe90hp8sACua9ylK1NabVtJlGDuHJ3IXQtl3molrhXTr0 UHqs99EbNl6JVHCw== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1790776480; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qo1mK+6exvY7ym1r/42jk9cIkBabDPh0YPHsTGPBx7Y=; b=vgF0nzHD01ED45N9TZGX9gMQ3tItYUq80BeUZ4ek5mjWL1xJFRCRm0Y1WYjUpwFiaQXZpY PVYF2XnO/w6AZz9OvdQt+EoIMFh4QDaTm0K+MgFvos/NYeMl08ojD7IldIY+wfS+oBKOOU L4QCK/mloMPLFdgoJJ8IJJPGBW0VZPI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1790776480; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qo1mK+6exvY7ym1r/42jk9cIkBabDPh0YPHsTGPBx7Y=; b=DU0yvjhrrsDKNWQqUUw/wbN67tpDCsJzNCgK2mmIajS4EW3CqB2o4WiJnzQIjv3gLiCbgz 5NMHObTs6IYKQGDQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 8769F13ABC; Wed, 30 Sep 2026 13:54:39 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id fJXpHGIUvWqUTwAAD6G6ig:T11 (envelope-from ); Wed, 30 Sep 2026 13:54:39 +0000 From: Fernando Fernandez Mancera To: netdev@vger.kernel.org Cc: horms@kernel.org, kuba@kernel.org, pabeni@redhat.com, edumazet@kernel.org, davem@davemloft.net, Fernando Fernandez Mancera , David Ahern , Ido Schimmel , Eric Dumazet , linux-kernel@vger.kernel.org Subject: [PATCH 10/16 net-next v3] tunnels: guard IPv4 tunnel functions with CONFIG_IPV4 Date: Wed, 30 Sep 2026 15:52:53 +0200 Message-ID: <20260930135334.4739-11-fmancera@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260930135334.4739-1-fmancera@suse.de> References: <20260930135334.4739-1-fmancera@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-6.76 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.16)[-0.819]; MIME_GOOD(-0.10)[text/plain]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email,imap1.dmz-prg2.suse.org:helo]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_EQ_ENVFROM(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RLrr9ek4ud4f4qwi71m7motjzt)]; RCPT_COUNT_SEVEN(0.00)[11]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -6.76 X-Spam-Level: X-Spam-Flag: NO To enable compiling INET subsystem withou IPv4, IPv4 specific IP tunnel core functions must be bypassed when the protocol is disabled. Signed-off-by: Fernando Fernandez Mancera --- net/ipv4/ip_tunnel_core.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c index bab42b9e277f..996e61243922 100644 --- a/net/ipv4/ip_tunnel_core.c +++ b/net/ipv4/ip_tunnel_core.c @@ -58,6 +58,14 @@ void iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb, struct iphdr *iph; int err; + if (!IS_ENABLED(CONFIG_IPV4)) { + if (dev) + DEV_STATS_INC(dev, tx_errors); + ip_rt_put(rt); + kfree_skb(skb); + return; + } + if (unlikely(dev_recursion_level() > IP_TUNNEL_RECURSION_LIMIT)) { if (dev) { net_crit_ratelimited("Dead loop on virtual device %s (net %llu), fix it urgently!\n", @@ -218,6 +226,9 @@ static int iptunnel_pmtud_build_icmp(struct sk_buff *skb, int mtu) struct ethhdr eh; int len, err; + if (!IS_ENABLED(CONFIG_IPV4)) + return -EOPNOTSUPP; + if (!pskb_may_pull(skb, ETH_HLEN + sizeof(struct iphdr))) return -EINVAL; -- 2.55.0