diff mbox series

[5.12,46/48] net/x25: Return the correct errno code

Message ID	20210616152838.091914580@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Zheng Yongjun <zhengyongjun3@huawei.com>, "David S. Miller" <davem@davemloft.net>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.12 46/48] net/x25: Return the correct errno code Date: Wed, 16 Jun 2021 17:33:56 +0200 Message-Id: <20210616152838.091914580@linuxfoundation.org> In-Reply-To: <20210616152836.655643420@linuxfoundation.org> References: <20210616152836.655643420@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.12,02/48] HID: asus: Filter keyboard EC for old ROG keyboard [5.12,03/48] HID: quirks: Set INCREMENT_USAGE_ON_DUPLICATE for Saitek X65 [5.12,04/48] HID: quirks: Add HID_QUIRK_NO_INIT_REPORTS quirk for Dell K15A keyboard-dock [5.12,06/48] HID: hid-input: add mapping for emoji picker key [5.12,08/48] HID: asus: filter G713/G733 key event to prevent shutdown [5.12,10/48] HID: multitouch: set Stylus suffix for Stylus-application devices, too [5.12,14/48] drm/tegra: sor: Do not leak runtime PM reference [5.12,15/48] gpu: host1x: Split up client initalization and registration [5.12,16/48] drm/tegra: sor: Fully initialize SOR before registration [5.12,18/48] ARM: OMAP1: Fix use of possibly uninitialized irq variable [5.12,20/48] gfs2: Prevent direct-I/O write fallback errors from getting lost [5.12,21/48] gfs2: fix a deadlock on withdraw-during-mount [5.12,23/48] HID: multitouch: Disable event reporting on suspend on the Asus T101HA touchpad [5.12,25/48] HID: intel-ish-hid: ipc: Add Alder Lake device IDs [5.12,26/48] riscv: Use -mno-relax when using lld linker [5.12,33/48] Bluetooth: Add a new USB ID for RTL8822CE [5.12,34/48] scsi: scsi_devinfo: Add blacklist entry for HPE OPEN-V [5.12,35/48] nvme-loop: reset queue count to 1 in nvme_loop_destroy_io_queues() [5.12,36/48] nvme-loop: clear NVME_LOOP_Q_LIVE when nvme_loop_configure_admin_queue() fails [5.12,37/48] nvme-loop: check for NVME_LOOP_Q_LIVE in nvme_loop_destroy_admin_queue() [5.12,41/48] drm/amdgpu: refine amdgpu_fru_get_product_info [5.12,44/48] drm/amd/amdgpu:save psp ring wptr to avoid attack [5.12,45/48] rtnetlink: Fix missing error code in rtnl_bridge_notify() [5.12,46/48] net/x25: Return the correct errno code

Commit Message

Greg KH June 16, 2021, 3:33 p.m. UTC

From: Zheng Yongjun <zhengyongjun3@huawei.com>

[ Upstream commit d7736958668c4facc15f421e622ffd718f5be80a ]

When kalloc or kmemdup failed, should return ENOMEM rather than ENOBUF.

Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 net/x25/af_x25.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index ff687b97b2d9..401901c8ad42 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -536,7 +536,7 @@  static int x25_create(struct net *net, struct socket *sock, int protocol,
 	if (protocol)
 		goto out;
 
-	rc = -ENOBUFS;
+	rc = -ENOMEM;
 	if ((sk = x25_alloc_socket(net, kern)) == NULL)
 		goto out;