From patchwork Fri Mar 31 07:56:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 77613 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp404280vqo; Fri, 31 Mar 2023 01:25:53 -0700 (PDT) X-Google-Smtp-Source: AKy350YkfdfZeX7swXQJDC+whRiW7DQfov1mrXlrRA1EGlB4QJB8MK1ayaNZ6TROnfpUEv9yM1S6 X-Received: by 2002:a17:90b:4a46:b0:240:b3ae:d881 with SMTP id lb6-20020a17090b4a4600b00240b3aed881mr8963782pjb.5.1680251153248; Fri, 31 Mar 2023 01:25:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680251153; cv=none; d=google.com; s=arc-20160816; b=r48m1hvZlsmLS1f8gJP1lE/txpdMgisZyFk9aqlOo9VM6TxlLYDKbpRUGfm0NO+wFK KHljTHq+FOcHNwz7U+6zUWaRFCT3ehKKnovGuJT+6a3u1vfcJZdWn3PVjbQxM7qZkMjH 5V7W5LqwmHSQANN4RgnVVHFZ/ids7z0Labw2G2rnQA9ggvIFog+7oIoB3PLxj4ipGXkC eZVuf4cbX2i499NGuC5E3pd9h7EgPuuqvBbu8RTC2SfqKuq4875NDHJW96sZpWk3pWJP xbKrRkBb1XTvzgRFaIhuxb7oMDnlxB6OeJ+SnvFwDG1Mbpot1Mea7I7g9iaNeqTnhQcn DztQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:subject:from:cc:to :content-language:user-agent:mime-version:date:message-id :dkim-signature; bh=V4eJlIvHXOm3/75lYaNQr5oPI/99sRGeqA0cdS3xh7M=; b=o6xheRU87+wgtvEuoUIaRFByeFp71mZzLY3SiIKdDxOnbkDobfRcjjGbCF4vhrS0Xc NlzmqqfXzmJjUvA3sgu0aQFKlphm7DpuVj6dldQ3LgyvkEIXG2ez4+CHXMTRRLz9U133 w5jVXHuc96ruZbT6SW1JXLkaok3NfnM6Ac7PSjmAGZKYBKuodzWhEvdtm0wkAXhBJfp2 Tlu5ZMkQ2Qx5l7IochTD5AJcf6UMoXGeIiPzWkKNLsJqQvWLSjYEsjAuD60X+eGwezf1 c6wUG4188jC+1Cu7pPqbSGqNiT861zvJY77a32+TogldejB33zoxZe/xQlHbxKI9IPJn eR2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=F1fxVg77; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g14-20020a63e60e000000b00502d85bfb5fsi1722716pgh.451.2023.03.31.01.25.39; Fri, 31 Mar 2023 01:25:53 -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=@sberdevices.ru header.s=mail header.b=F1fxVg77; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231220AbjCaIAT (ORCPT + 99 others); Fri, 31 Mar 2023 04:00:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229441AbjCaIAR (ORCPT ); Fri, 31 Mar 2023 04:00:17 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E62ABEB63; Fri, 31 Mar 2023 01:00:14 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id AD83B5FD37; Fri, 31 Mar 2023 11:00:11 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1680249611; bh=V4eJlIvHXOm3/75lYaNQr5oPI/99sRGeqA0cdS3xh7M=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=F1fxVg77CUxw+QIRT8vN1DfEK8cX92WJsSUciLe2tobx/nuvIVz6mcEbXrDs84NGN CjJnjVE37rUkma6nJ8NN3lcY/9AguGGZomk90k+wdZO06/NOV7pixWNypr0cQXt6SU iCjObWsgnhMPFuq08k1dB+X8PB923RnecNfGndckFyUtmdC7DwhNbQ702OO2QYVU5G 6wIosDmXdvaWUfEDIExF5HDZOxMTLa1hdP7Ib0GdYYWooNC3G57teXjHBSsKM8HlWh h13KIQmzOEw/F4CPPYjoWQiTV/9S4Vdeeuqt2V35+BSTgXDSmFFCuZPULmyFMTyZJ4 MERi7ZgzQ9eQw== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Fri, 31 Mar 2023 11:00:07 +0300 (MSK) Message-ID: <2c3aeeac-2fcb-16f6-41cd-c0ca4e6a6d3e@sberdevices.ru> Date: Fri, 31 Mar 2023 10:56:41 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Content-Language: en-US To: Stefan Hajnoczi , Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bobby Eshleman , Bryan Tan , Vishnu Dasa CC: , , , , , , , From: Arseniy Krasnov Subject: [PATCH net] vsock/vmci: convert VMCI error code to -ENOMEM on send X-Originating-IP: [172.16.1.6] X-ClientProxiedBy: S-MS-EXCH02.sberdevices.ru (172.16.1.5) To S-MS-EXCH01.sberdevices.ru (172.16.1.4) X-KSMG-Rule-ID: 4 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Status: not scanned, disabled by settings X-KSMG-AntiSpam-Interceptor-Info: not scanned X-KSMG-AntiPhishing: not scanned, disabled by settings X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2023/03/31 05:18:00 #21105108 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761871033239006934?= X-GMAIL-MSGID: =?utf-8?q?1761871033239006934?= This adds conversion of VMCI specific error code to general -ENOMEM. It is needed, because af_vsock.c passes error value returned from transport to the user, which does not expect to get VMCI_ERROR_* values. Fixes: c43170b7e157 ("vsock: return errors other than -ENOMEM to socket") Signed-off-by: Arseniy Krasnov Reviewed-by: Vishnu Dasa Reviewed-by: Stefano Garzarella --- net/vmw_vsock/vmci_transport.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c index 36eb16a40745..95cc4d79ba29 100644 --- a/net/vmw_vsock/vmci_transport.c +++ b/net/vmw_vsock/vmci_transport.c @@ -1842,7 +1842,13 @@ static ssize_t vmci_transport_stream_enqueue( struct msghdr *msg, size_t len) { - return vmci_qpair_enquev(vmci_trans(vsk)->qpair, msg, len, 0); + ssize_t err; + + err = vmci_qpair_enquev(vmci_trans(vsk)->qpair, msg, len, 0); + if (err < 0) + err = -ENOMEM; + + return err; } static s64 vmci_transport_stream_has_data(struct vsock_sock *vsk)