Received: by 2002:a05:7412:f690:b0:e2:908c:2ebd with SMTP id ej16csp890469rdb; Fri, 20 Oct 2023 02:24:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEYV9g5m2Ioa9KDAlzyKV8vNy8Usc7tVlSraISLH3Aqzt+CpbIOGv6axu1aUdkWLYrMEdPU X-Received: by 2002:a9d:6d83:0:b0:6c2:2bca:7a14 with SMTP id x3-20020a9d6d83000000b006c22bca7a14mr1270187otp.23.1697793845124; Fri, 20 Oct 2023 02:24:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697793845; cv=none; d=google.com; s=arc-20160816; b=auDeG2zo9amd9KinI6H4crQ2PH3gWIl+jimCA8tyOCR+P+6kXe2lUCafqERuf8IFQB YXen1ZmoSIcr8Z0KVQIrKRJXSc5GRC0uciaC3o+xf83ZrZZ1XILD1Yfsjv1X40Eg4CLn pR15GqbAelQWKuL4wSiuUWVwNmUzkJhBQw9CRaO1TGs2/eq49Xwed25Q2zZRyB1E1/xn 9eDAdH4Vli4YjM7fWnC49uitAlUqVmQ9rsnfe7kVG1loVpxes9Z+2qWKH8gKe/6jVnNN Y8ucJMWqVoHZMVb/xrxuaK16wx28yfzJUk+cx1SRJcuthaR5OR7xEOGvKoEOKo0YLmbk z+aA== 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 :message-id:date:subject:cc:to:from; bh=HhU8L0goLUWomsPr54cq2gnUdguPCuctICbsBA1DjRs=; fh=hqDz8A79Vftc1bfegtp5jJ3vDtymD7tHSzkqiEHZnS4=; b=YVlrq0Ii0SgK/5XZ84LsEEgM+JqCDtFp+8gPyUOZhd5YFMIK5IMu0mzxh4pqezGiS+ vNEX9UxOLybrrgFEPmOtWq4QdIFIQ84wDz3J8/9+oy9quazxfY0yWLWUEWgWUoSmmlt0 zYr/ahh5gR4CRLH3HmFtWTucY1j72CuTUlEpTf+5nNpmTYoDlQCn/VsxP/Y0Lv8IvZnU 39+DKhQDfVMxyb1bQ5drzkt0EB5dhF+7lYygRX0OMY8UEpNYFN4gU9WPtKZKWvBKdH0O 40kxxv/lCSL88T45uIhSXFZazaiwm8X8qHeFXaUzg+NL+orNj1+9ZPTt4hw98mi2yPJ+ KeDQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id b11-20020aa7950b000000b006b356972c78si1402189pfp.405.2023.10.20.02.24.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 02:24:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 1E3698095439; Fri, 20 Oct 2023 02:24:01 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376622AbjJTJXp (ORCPT + 99 others); Fri, 20 Oct 2023 05:23:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376612AbjJTJXm (ORCPT ); Fri, 20 Oct 2023 05:23:42 -0400 Received: from mail.nfschina.com (unknown [42.101.60.195]) by lindbergh.monkeyblade.net (Postfix) with SMTP id 21423106; Fri, 20 Oct 2023 02:23:39 -0700 (PDT) Received: from localhost.localdomain (unknown [180.167.10.98]) by mail.nfschina.com (Maildata Gateway V2.8.8) with ESMTPA id EE915604FCB31; Fri, 20 Oct 2023 17:23:30 +0800 (CST) X-MD-Sfrom: suhui@nfschina.com X-MD-SrcIP: 180.167.10.98 From: Su Hui To: mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com Cc: Su Hui , virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH] virtio_ring: add an error code check in virtqueue_resize Date: Fri, 20 Oct 2023 17:23:21 +0800 Message-Id: <20231020092320.209234-1-suhui@nfschina.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,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 howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Fri, 20 Oct 2023 02:24:02 -0700 (PDT) virtqueue_resize_packed() or virtqueue_resize_split() can return error code if failed, so add a check for this. Signed-off-by: Su Hui --- I'm not sure that return directly is right or not, maybe there are some process should do before return. drivers/virtio/virtio_ring.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 51d8f3299c10..cf662c3a755b 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -2759,6 +2759,9 @@ int virtqueue_resize(struct virtqueue *_vq, u32 num, else err = virtqueue_resize_split(_vq, num); + if (err) + return err; + return virtqueue_enable_after_reset(_vq); } EXPORT_SYMBOL_GPL(virtqueue_resize); -- 2.30.2