From nobody Mon Apr 29 08:30:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1619156475; cv=none; d=zohomail.com; s=zohoarc; b=ipDqT/WCSa9JX5admnxWyWcr3t7cf+n9U2+A2AmqSJB4sxpVM7Gak5qS7BrUByHN+oT01qmphxvr6RnsRpyWcnA0+NYVmk38Wi4qD1Oa+PchkI9T4+1IupfBLW2de64PXMyNEQDa2n5AnYSLjtxDb9Csd7hi6FkJ/Dpyv1k4lPA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619156475; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=NZgPMke49PfmASyT+K1h7cCq8emc+deK1BAEsqWaEPw=; b=jrQgbBjf2LLe+kBWy/qjgWucdoOUoC7etrvO15jqwXzI1dzfAeNhgvaUgdyh4RE1LSLEsFg+kWmHZfuoOBzR0ohLN0s4tAX9m89DoXmoCO0I/rJ/xZ80pzpziUV89MW0mXSYJ3sMEOaDBLOhPV5JTaKjHeAgWw+Rog2DyOaQnNI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 161915647530544.553638760946455; Thu, 22 Apr 2021 22:41:15 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.115886.221148 (Exim 4.92) (envelope-from ) id 1lZoYW-0002TF-TY; Fri, 23 Apr 2021 05:40:44 +0000 Received: by outflank-mailman (output) from mailman id 115886.221148; Fri, 23 Apr 2021 05:40:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lZoYW-0002T7-PD; Fri, 23 Apr 2021 05:40:44 +0000 Received: by outflank-mailman (input) for mailman id 115886; Fri, 23 Apr 2021 05:40:43 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lZoYV-0002T2-JT for xen-devel@lists.xenproject.org; Fri, 23 Apr 2021 05:40:43 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b943e409-507d-422d-9926-a6dc5f74275f; Fri, 23 Apr 2021 05:40:41 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 900A8AEFF; Fri, 23 Apr 2021 05:40:40 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b943e409-507d-422d-9926-a6dc5f74275f X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1619156440; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NZgPMke49PfmASyT+K1h7cCq8emc+deK1BAEsqWaEPw=; b=nTAr2IN5DBYPkCFqqq+eLwiXMbbGmun0odKrA+jJl9NkITBehpkoRHRYzfVNtvBzmoeuIx uYmVjrOyOHPTYfbyo4bnoAYOUgajPgFeLwqQQW5KmbeogJnwctPoA7R3s8xLQFI1UgkAWo bsa7Mo+q2jzxdBaftOmifhikTfSdt7I= From: Juergen Gross To: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org Cc: Juergen Gross , Boris Ostrovsky , Stefano Stabellini , stable@vger.kernel.org, =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Subject: [PATCH] xen/gntdev: fix gntdev_mmap() error exit path Date: Fri, 23 Apr 2021 07:40:38 +0200 Message-Id: <20210423054038.26696-1-jgross@suse.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) Commit d3eeb1d77c5d0af ("xen/gntdev: use mmu_interval_notifier_insert") introduced an error in gntdev_mmap(): in case the call of mmu_interval_notifier_insert_locked() fails the exit path should not call mmu_interval_notifier_remove(), as this might result in NULL dereferences. One reason for failure is e.g. a signal pending for the running process. Fixes: d3eeb1d77c5d0af ("xen/gntdev: use mmu_interval_notifier_insert") Cc: stable@vger.kernel.org Reported-by: Marek Marczykowski-G=C3=B3recki Tested-by: Marek Marczykowski-G=C3=B3recki Signed-off-by: Juergen Gross Reviewed-by: Luca Fancellu --- drivers/xen/gntdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c index f01d58c7a042..a3e7be96527d 100644 --- a/drivers/xen/gntdev.c +++ b/drivers/xen/gntdev.c @@ -1017,8 +1017,10 @@ static int gntdev_mmap(struct file *flip, struct vm_= area_struct *vma) err =3D mmu_interval_notifier_insert_locked( &map->notifier, vma->vm_mm, vma->vm_start, vma->vm_end - vma->vm_start, &gntdev_mmu_ops); - if (err) + if (err) { + map->vma =3D NULL; goto out_unlock_put; + } } mutex_unlock(&priv->lock); =20 --=20 2.26.2