From patchwork Fri Aug 4 08:48:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 131045 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:44a:b0:3f2:4152:657d with SMTP id ez10csp136448vqb; Fri, 4 Aug 2023 02:29:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGHlCVdDOPg9F1FZKLqjpw+K0wZR1X6ZPLii2KQPf+nIJf1+nikQAOMx5qFaa2sjOFqUTIa X-Received: by 2002:a17:90b:3850:b0:267:6fd0:bd31 with SMTP id nl16-20020a17090b385000b002676fd0bd31mr1830787pjb.7.1691141377228; Fri, 04 Aug 2023 02:29:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691141377; cv=none; d=google.com; s=arc-20160816; b=GoD4QF1GuuPcf+6QTjrsrYajq57yM0dlEh3EEuWsBbhYtJ3w/WNZff0+Uy3oRh86F3 lzRBEgdDsr+diV/4h1H3v+Vght3f3KlZgXoRRa1jAiH2EogTYlh6SCo5eTRjlobfTjZu 6Jz5pY4vppvmKFdT6QgOKO2ivpEVaxLdYqS4HBoYMAx/YCH65Pcz6+kOed5A3dDSAExO eC9T/XAo7q+9l1UFcht0JH6kt5n2eN6F7atOvoOkr90oSEOOSky6OUB5VwN6w5mlXG6E 0OcXeXARv2uTg4ry5LPztbjyvbsPMNloKBcBaTMbM3M7dkt2G0+oESKIfc11tlrSWNSQ NtGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:cc:to:from:mime-version:message-id:date; bh=lV/i+SAgpc1SjMGPsO2ns4ELEqxE81aXn9ig2eFY0Oo=; fh=VX/Ya237jnqve4054D0Ov32VyHUHRsjkplnAOdTxQfQ=; b=K6MYdBTYkcdeVwLWvW1G6ujK2zYCH8A6wRtNakrH7Ie+MchuUKE5ouvEa79cnZpGnU knwvWg8DSFAQofymk5VuU0wyX0NDoCkk+d0QND1xqjm521WlyK2wibuyJgJdT0hc+Ibx 6BwtH3O428QmgMI3v971s8N3IcSifx2KYhKA3gurOZ7FCftSD2OzUIlZqO4Irr4plq3o 6xboCEz5yGSJ1GQrDJoezkBlziYmz2NPgHSHuGk5oidvHPoZ/ifM9ogDC0xrn7U8M8Kh fb+ZgMEK10Uc0iCAKo/jzrc97cncG9STJYcDip7dGW77tKaHuJxamh2bbqsjM77Tpoxa fzIg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nu6-20020a17090b1b0600b0024e4ace1a41si1719295pjb.183.2023.08.04.02.29.24; Fri, 04 Aug 2023 02:29:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229713AbjHDItc (ORCPT + 99 others); Fri, 4 Aug 2023 04:49:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229727AbjHDItM (ORCPT ); Fri, 4 Aug 2023 04:49:12 -0400 Received: from mxct.zte.com.cn (mxct.zte.com.cn [58.251.27.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F243C49FC; Fri, 4 Aug 2023 01:49:08 -0700 (PDT) Received: from mxde.zte.com.cn (unknown [10.35.20.165]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mxct.zte.com.cn (FangMail) with ESMTPS id 4RHKBl75klzZK6m; Fri, 4 Aug 2023 16:49:03 +0800 (CST) Received: from mxhk.zte.com.cn (unknown [192.168.250.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mxde.zte.com.cn (FangMail) with ESMTPS id 4RHKBS5XZ3z5BfmN; Fri, 4 Aug 2023 16:48:48 +0800 (CST) Received: from mse-fl1.zte.com.cn (unknown [10.5.228.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxhk.zte.com.cn (FangMail) with ESMTPS id 4RHKBP46FGz7QYS7; Fri, 4 Aug 2023 16:48:45 +0800 (CST) Received: from szxlzmapp05.zte.com.cn ([10.5.230.85]) by mse-fl1.zte.com.cn with SMTP id 3748mV09049239; Fri, 4 Aug 2023 16:48:31 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp01[null]) by mapi (Zmail) with MAPI id mid14; Fri, 4 Aug 2023 16:48:33 +0800 (CST) Date: Fri, 4 Aug 2023 16:48:33 +0800 (CST) X-Zmail-TransId: 2b0364ccbb6161e-7e8ca X-Mailer: Zmail v1.0 Message-ID: <202308041648338823694@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , Subject: =?utf-8?q?=5BPATCH=5D_net/ipv4=3A_return_the_real_errno_instead_of_?= =?utf-8?q?-EINVAL?= X-MAIL: mse-fl1.zte.com.cn 3748mV09049239 X-Fangmail-Gw-Spam-Type: 0 X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 64CCBB7E.001/4RHKBl75klzZK6m X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773290260582765713 X-GMAIL-MSGID: 1773290260582765713 From: xu xin For now, no matter what error pointer ip_neigh_for_gw() returns, ip_finish_output2() always return -EINVAL, which may mislead the upper users. For exemple, an application uses sendto to send an UDP packet, but when the neighbor table overflows, sendto() will get a value of -EINVAL, and it will cause users to waste a lot of time checking parameters for errors. Return the real errno instead of -EINVAL. Signed-off-by: xu xin Reviewed-by: Yang Yang Cc: Si Hao Cc: Dai Shixin Cc: Jiang Xuexin --- net/ipv4/ip_output.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 6ba1a0fafbaa..2d7cf083dff9 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -201,6 +201,7 @@ static int ip_finish_output2(struct net *net, struct sock *sk, struct sk_buff *s unsigned int hh_len = LL_RESERVED_SPACE(dev); struct neighbour *neigh; bool is_v6gw = false; + int res; if (rt->rt_type == RTN_MULTICAST) { IP_UPD_PO_STATS(net, IPSTATS_MIB_OUTMCAST, skb->len); @@ -214,8 +215,7 @@ static int ip_finish_output2(struct net *net, struct sock *sk, struct sk_buff *s } if (lwtunnel_xmit_redirect(dst->lwtstate)) { - int res = lwtunnel_xmit(skb); - + res = lwtunnel_xmit(skb); if (res < 0 || res == LWTUNNEL_XMIT_DONE) return res; } @@ -223,8 +223,6 @@ static int ip_finish_output2(struct net *net, struct sock *sk, struct sk_buff *s rcu_read_lock(); neigh = ip_neigh_for_gw(rt, skb, &is_v6gw); if (!IS_ERR(neigh)) { - int res; - sock_confirm_neigh(skb, neigh); /* if crossing protocols, can not use the cached header */ res = neigh_output(neigh, skb, is_v6gw); @@ -236,7 +234,8 @@ static int ip_finish_output2(struct net *net, struct sock *sk, struct sk_buff *s net_dbg_ratelimited("%s: No header cache and no neighbour!\n", __func__); kfree_skb_reason(skb, SKB_DROP_REASON_NEIGH_CREATEFAIL); - return -EINVAL; + res = PTR_ERR(neigh); + return res; } static int ip_finish_output_gso(struct net *net, struct sock *sk,