From mboxrd@z Thu Jan 1 00:00:00 1970 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=-19.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 AD257C47095 for ; Mon, 7 Jun 2021 16:26:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9B38261447 for ; Mon, 7 Jun 2021 16:26:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233488AbhFGQ1x (ORCPT ); Mon, 7 Jun 2021 12:27:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:33404 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233984AbhFGQZC (ORCPT ); Mon, 7 Jun 2021 12:25:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C04D161955; Mon, 7 Jun 2021 16:16:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1623082563; bh=lWK4PrekwHPl0zuED/ls247l+BlY1VDPSahVqMIh9tA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RAXG5lNWMPhUelu4oByxzeDHTlPKgaUX9l3T7L4b0M7J0HFlCKLExX8Q/aIhJsoP2 ri/0LCbg8DBx5kmpGZDJrp0Pk6mlvGuJLUx9uwHKo2aAKlOsSECkE9h/L8EvNM+/t2 4cHJ4Jawh+OuyAXv9wABeIXJqVjV61+9DX36lVI5tgzFNOM/0zNjbHz8IxkNWtZn2Y tKgor/yF5V9lQjYAs4sEHewJRW/i/GXeN4ksFUSPX9vaqdMQ1/fPC3ERtcsa1hjYji WCalkusVBep06hdrpJTgTi6lE218TR5zNAslTi1XpJRT7eFQrgAWbwVmHsaNZ7ijJ8 mdP2rx4Xb2xnQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zheng Yongjun , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 14/15] net: Return the correct errno code Date: Mon, 7 Jun 2021 12:15:42 -0400 Message-Id: <20210607161543.3584778-14-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210607161543.3584778-1-sashal@kernel.org> References: <20210607161543.3584778-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Zheng Yongjun [ Upstream commit 49251cd00228a3c983651f6bb2f33f6a0b8f152e ] When kalloc or kmemdup failed, should return ENOMEM rather than ENOBUF. Signed-off-by: Zheng Yongjun Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/compat.c b/net/compat.c index ce851cf4d0f9..1f08f0e49e07 100644 --- a/net/compat.c +++ b/net/compat.c @@ -159,7 +159,7 @@ int cmsghdr_from_user_compat_to_kern(struct msghdr *kmsg, struct sock *sk, if (kcmlen > stackbuf_size) kcmsg_base = kcmsg = sock_kmalloc(sk, kcmlen, GFP_KERNEL); if (kcmsg == NULL) - return -ENOBUFS; + return -ENOMEM; /* Now copy them over neatly. */ memset(kcmsg, 0, kcmlen); -- 2.30.2