Received: by 2002:a05:6358:489b:b0:bb:da1:e618 with SMTP id x27csp874685rwn; Thu, 15 Sep 2022 07:37:15 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4dFGsc0xV2P3tk1P0eowtSCU5E5VhFPwjH6ylgUP/d2OXQ53mmZzz35pGlI00wSCtdWFJk X-Received: by 2002:a17:907:320b:b0:780:280:7b72 with SMTP id xg11-20020a170907320b00b0078002807b72mr243763ejb.146.1663252634842; Thu, 15 Sep 2022 07:37:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663252634; cv=none; d=google.com; s=arc-20160816; b=IlwC/HBQh8zS5pr393/MD8HJxDE2h9VFUYVhRkZ8mIJwEV7bl4NCweuz6a+Az1YQEJ 8/+nvM4UZRaXYkTXKHuc4Ebh5VkdVRnugFFOLXEv3iz4vWDQtRxCBMi3WKqkueWGPNjI l7Y3s9qzK12zUrc0z9Bg0CYVzR92/CuirY6MxRfo8xN3h9rPBTSDfm9hAbBIwUOITr5z QwN7UIN7sS5MfwAiQNBdgvNdH2nW/DhqSeHFaep0UAaIwD6hWcszogkfH2BJOUirZ4Aj Hb4yfmYqBOwlE2+CFCu50WLJlhyBdct7wSqOe8VLe/hhRe+Ujv7/bb4BQBVR/h6Z40pO 519w== 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:dkim-signature; bh=dzoAgu6mheUOzlynwIyePFbncbuBp9hucJwC4AGAEMg=; b=kZNc/Xsz7qBGpwajFxgTjU61+DM+NJAQoG+s+wSv/UzqimFcqY4MF3pJWGDi2XCrQ7 nzoibF0Wsqla6GItRWIL9zBS6m98dk5wI9g4HjBUDhj2lFpELrydBdGTFQ3py21dQFmQ wrJS8FRNHRMvuE8OyWWbJ9swlU8PQtgiyVjw0BCzntRofTZc1C5jXb+xf10vbEkBOTBz xf9RBOItF77YpeWeZ8TOgAZdFaCqavQ7lJbLkhchngqQdaOc12sd0VO7PRAn5jJJOm0I 0c040tpIGxDJOkLEZxYI67Gj5U2D7DNKAYG9F62c+bBnbfWpyiEvlJx+U0g4dexmoaSm FneQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=cBu5DlTC; 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=suse.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g8-20020a056402090800b00446ce49ddf6si17338200edz.96.2022.09.15.07.36.47; Thu, 15 Sep 2022 07:37:14 -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=@suse.com header.s=susede1 header.b=cBu5DlTC; 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=suse.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229861AbiIOObp (ORCPT + 99 others); Thu, 15 Sep 2022 10:31:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46742 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229695AbiIOObn (ORCPT ); Thu, 15 Sep 2022 10:31:43 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 300B989934; Thu, 15 Sep 2022 07:31:42 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id D1CD31F8AF; Thu, 15 Sep 2022 14:31:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1663252300; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=dzoAgu6mheUOzlynwIyePFbncbuBp9hucJwC4AGAEMg=; b=cBu5DlTCREcpIg2AL2xFilshrjAlZTvrjdO687YcesK9GrOmCA581P3FxwwuYLrZ+YkHpE Sf7gTfCFQhBDBDudEhF0MI7TmSLcA60AMgyUI28s9e2hH5T3IFxj25WBCY7sZwFQXroC3E yL1W20RErwozixvr7renhuJpHHkbSjI= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 9DA73133B6; Thu, 15 Sep 2022 14:31:40 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id DRsmJUw3I2OVegAAMHmgww (envelope-from ); Thu, 15 Sep 2022 14:31:40 +0000 From: Juergen Gross To: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org Cc: Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko , stable@vger.kernel.org, Sander Eikelenboom Subject: [PATCH] xen/xenbus: fix xenbus_setup_ring() Date: Thu, 15 Sep 2022 16:31:37 +0200 Message-Id: <20220915143137.1763-1-jgross@suse.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 Commit 4573240f0764 ("xen/xenbus: eliminate xenbus_grant_ring()") introduced an error for initialization of multi-page rings. Cc: stable@vger.kernel.org Fixes: 4573240f0764 ("xen/xenbus: eliminate xenbus_grant_ring()") Reported-by: Sander Eikelenboom Signed-off-by: Juergen Gross --- drivers/xen/xenbus/xenbus_client.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c index d5f3f763717e..caa5c5c32f8e 100644 --- a/drivers/xen/xenbus/xenbus_client.c +++ b/drivers/xen/xenbus/xenbus_client.c @@ -382,9 +382,10 @@ int xenbus_setup_ring(struct xenbus_device *dev, gfp_t gfp, void **vaddr, unsigned long ring_size = nr_pages * XEN_PAGE_SIZE; grant_ref_t gref_head; unsigned int i; + void *addr; int ret; - *vaddr = alloc_pages_exact(ring_size, gfp | __GFP_ZERO); + addr = *vaddr = alloc_pages_exact(ring_size, gfp | __GFP_ZERO); if (!*vaddr) { ret = -ENOMEM; goto err; @@ -401,13 +402,15 @@ int xenbus_setup_ring(struct xenbus_device *dev, gfp_t gfp, void **vaddr, unsigned long gfn; if (is_vmalloc_addr(*vaddr)) - gfn = pfn_to_gfn(vmalloc_to_pfn(vaddr[i])); + gfn = pfn_to_gfn(vmalloc_to_pfn(addr)); else - gfn = virt_to_gfn(vaddr[i]); + gfn = virt_to_gfn(addr); grefs[i] = gnttab_claim_grant_reference(&gref_head); gnttab_grant_foreign_access_ref(grefs[i], dev->otherend_id, gfn, 0); + + addr += PAGE_SIZE; } return 0; -- 2.35.3