Received: by 2002:a05:6602:2086:0:0:0:0 with SMTP id a6csp4337352ioa; Wed, 27 Apr 2022 01:10:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+eHzVewXOL+gLEQLrSbIXP3Ah9SdOmJ7JSkLtkeZLtZewWqtLSBJXQgsmk8LO6VB3GCrE X-Received: by 2002:a05:6a00:e0e:b0:50a:cb86:883c with SMTP id bq14-20020a056a000e0e00b0050acb86883cmr28786579pfb.11.1651047024977; Wed, 27 Apr 2022 01:10:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651047024; cv=none; d=google.com; s=arc-20160816; b=nHWKhYVYRIWRNt7TVmgicMu4ECpyrSgQHAdoQQycpGrNrbFQiOdBUbnmaNZeCUqoc+ LNHJLLhsB5IacneOdULUpLBGXSPTRdFe+k1vrMy8uzPALrhoFkA/XpcLcyezHvAXVpya nzcwFMLiPe7bBtZYF/rdav0lytgvT0uD2TTOW/Vm2SgaPNeKA8nM8RESQEhLapdJzVAi mFUhV3i6S3GfGQsRB5OcosZLnQL9b6Xor3WMka/6Lie8g4cs21R0v5kr1LMbcEQ7w97n zakoa5qfakz3VGhkIGJWtWfjJTGm5dyt99VhkkZ5q/tAsjunXteVTNOkmUJEvTjI/6Y1 vD6A== 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=/HbNeZrpBHGZMr0TuHMKSNH1028LPLi9bMOwfIKS1qQ=; b=M1uvqcE/LfatkscpTYBvEb4sB8A8DWnRN+5XTr1Yi0E3ORVetIJ24cdRLEJvguS0Zd bvnHEpdhokVHsQCMJIKOiqW6DA99hFmxP5m0j/eRERlE7wCtkxXUCgE8/DRNgsVJiS1J Hv6wQwMmbCg9bEGRwptzCt5CEGi7O43ZlWUYZy/IbPjomM7iL3upfb1NMPc6y2nwgVXw nebgwKSLp82McwexpPZrJBIT87noNWrG5o5C+isoxZZJHknYAG7IGeM3aiY58h54tBCl PJrV1v6hxyqdpPwxgZtPPkMx8Bn5Zlh8DIet0wqdWCF3H9tdFNptSCfxX1pcNrNdYctN DTBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YmizzJof; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a186-20020a6390c3000000b003aa67dc6efesi730432pge.688.2022.04.27.01.10.09; Wed, 27 Apr 2022 01:10:24 -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; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YmizzJof; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345676AbiDZI6O (ORCPT + 99 others); Tue, 26 Apr 2022 04:58:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346423AbiDZIpB (ORCPT ); Tue, 26 Apr 2022 04:45:01 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC955167F1E; Tue, 26 Apr 2022 01:34:45 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 7090FB81D09; Tue, 26 Apr 2022 08:34:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CE140C385A0; Tue, 26 Apr 2022 08:34:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1650962083; bh=vbMCQhYpFOrJqjfbCfIgDM/0g8eUs24bpcjR8pwBGS4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YmizzJofKY4RKUVOXtw+4Gul1HmWcPUys6RsvjcOHf2EFZifyZWgfd5+VeSJ3ZW1a b+j4hw0QqkaNRTT2pyZ3tIHGn3JtpcIRrUIBFckdCoL2LCTPkMEuypqH2LznfqY7T4 9hVlUEZX7s8rAA4/qKS9uaZ35bl2oyf1/NqGWjmU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hongbin Wang , "David S. Miller" , Sasha Levin Subject: [PATCH 5.10 39/86] vxlan: fix error return code in vxlan_fdb_append Date: Tue, 26 Apr 2022 10:21:07 +0200 Message-Id: <20220426081742.334423312@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220426081741.202366502@linuxfoundation.org> References: <20220426081741.202366502@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 From: Hongbin Wang [ Upstream commit 7cea5560bf656b84f9ed01c0cc829d4eecd0640b ] When kmalloc and dst_cache_init failed, should return ENOMEM rather than ENOBUFS. Signed-off-by: Hongbin Wang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/vxlan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 48fbdce6a70e..72d670667f64 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -710,11 +710,11 @@ static int vxlan_fdb_append(struct vxlan_fdb *f, rd = kmalloc(sizeof(*rd), GFP_ATOMIC); if (rd == NULL) - return -ENOBUFS; + return -ENOMEM; if (dst_cache_init(&rd->dst_cache, GFP_ATOMIC)) { kfree(rd); - return -ENOBUFS; + return -ENOMEM; } rd->remote_ip = *ip; -- 2.35.1