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 ED0BBC47094 for ; Mon, 7 Jun 2021 16:26:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B9B5761447 for ; Mon, 7 Jun 2021 16:26:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234007AbhFGQ2E (ORCPT ); Mon, 7 Jun 2021 12:28:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:59806 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233689AbhFGQYR (ORCPT ); Mon, 7 Jun 2021 12:24:17 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0D1C061375; Mon, 7 Jun 2021 16:15:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1623082540; bh=PW9i5nQ9u/7zRXFaJi4+KmTo3QsTKyQlAlfxo6yFvv0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rn0RG/p2Hg/G3yreJ667rFpnn/eYLqmKoKTcTEi0A76nc9JGg08FL/QcwtWMVbUfo o0ZwrXmCAHiOei0hPcgOWjtqsCtEuOOPTwht+kThZN/F0quQgWHD3vJoPP+by3vcwN nZiGyPmVlpkJkWqJkgP3ztLwmw89lb8WtC5USOhHgZIjN0NL/AIUlnR5Yr0HfvAgxr HPOCFCAPHs8994aY061ykl9y1LVIePyIBJIF/I6Boln6GL2Yn0F9+4bY07mp0hVq4V 0pkveaDmZ1ugLrncB00xlUXlqD0UiyDAzork3ScgxNS/Y5l85dZkJt5XXouUDYLmPK 5v6BKLt5BiELA== 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.14 17/18] net: Return the correct errno code Date: Mon, 7 Jun 2021 12:15:15 -0400 Message-Id: <20210607161517.3584577-17-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210607161517.3584577-1-sashal@kernel.org> References: <20210607161517.3584577-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: linux-kernel@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 45349658ed01..2ec822f4e409 100644 --- a/net/compat.c +++ b/net/compat.c @@ -158,7 +158,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