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;
From:   Eiichi Tsukata <eiichi.tsukata@nutanix.com>
To:     seanjc@google.com, pbonzini@redhat.com, tglx@linutronix.de,
        mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com,
        x86@kernel.org, hpa@zytor.com, kvm@vger.kernel.org,
        linux-kernel@vger.kernel.org, ankur.a.arora@oracle.com,
        dwmw@amazon.co.uk, joao.m.martins@oracle.com
Cc:     Eiichi Tsukata <eiichi.tsukata@nutanix.com>,
        syzbot+6f0c896c5a9449a10ded@syzkaller.appspotmail.com
Subject: [PATCH] KVM: x86/xen: Fix eventfd error handling in kvm_xen_eventfd_assign()
Date:   Fri, 28 Oct 2022 09:26:31 +0000
Message-Id: <20221028092631.117438-1-eiichi.tsukata@nutanix.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3oeg52l09Cjy11enXI2LhMCL6ihJ428ImWDA5Muhl8iRxxxilcrTQew3sGUv?=
 =?us-ascii?Q?5QrcKljne1go5yVRK8H5IoBg/W5FwddjyxhtrcRh9CO44dBiakPgLZF4NzzO?=
 =?us-ascii?Q?knaXTZDAgVZv6ZYQp8oyydkB2yOaxXlecHdiGWxPxmdz17I01FHuSEDalt8I?=
 =?us-ascii?Q?82oivql3jxw8R1MB8sfYE0nGsODbbp7o1MVudWV6BayRcceky0OB5omVyT2B?=
 =?us-ascii?Q?bTAk2afd0X7cq4GdHVLExxuQCkq/j0cv/9CoH7dMoQBhVmKtXG6dStDnW2Cq?=
 =?us-ascii?Q?mjp2VmeU+o76OK06IIX7NbxE95hsI93h1EBogxBZOlwa2ud/N4MJioDGPK41?=
 =?us-ascii?Q?sG5jJF7Hu70KIZ82DdcBO+xkpKo/htUZF0NMZRWU/zFKmYt7rXD+wNKeHhA1?=
 =?us-ascii?Q?rEoRLQ1hvRHp33xqQXRPrwAFh4kE0fYFR+Y+5PZHY+2b5Qkj0WJEut8t1BwD?=
 =?us-ascii?Q?wWR4vke3QYrRu0apDPDB5M5v+g2EXExRWHa2miPnySacmaru8PuKeor5M0FW?=
 =?us-ascii?Q?Y/22LnVAVBI1a9QoWwK0dDXPoV30m8hGzXLEWRAV1Kh1HhEjY3uc0dQmefIG?=
 =?us-ascii?Q?QmAsOHQ370jvtBolMNMDne3Scypb+V5YaxDOMaPJ8PEfTfbhxlUatm4ELegv?=
 =?us-ascii?Q?8GSgBXoUQuFU6H2pC1YAPqeYjZqZGENCsgIcgvdBvDeTy+5MkzR1F8odH2Hv?=
 =?us-ascii?Q?oBiXdHGNA+zAjL9UXurtO2adh/nJ6eC5amdWxjj0y13hGFx6roeNimdX52Ka?=
 =?us-ascii?Q?mmkVKqOY2ZtQ9jAzEhJlMMB5ZtQNTBvc4206B912A1oSHseQocwnJENusxGo?=
 =?us-ascii?Q?NP2PycsguP1dI58oPgSO7EOdWP4QQIKsdUez4iJ/VSqzobpYJpKYREhlGFDo?=
 =?us-ascii?Q?10j1USQwO83dd8AOtWFdCTa6etTXxsThvAeDZSQEK6nnlEwMnzzaWsbq3iY+?=
 =?us-ascii?Q?q6VsTWCdA66lWHHnYeW0SQArcYeKknXFn137G8d/YnPIFDpYV2Io6zHyIlLI?=
 =?us-ascii?Q?3JoPuWsics9MonLPbbZKk0+OapSP4vDLrbQCHaM5Ae/N+lwRwzfPRgI95M60?=
 =?us-ascii?Q?kF4uFv/CimCYdAXT3xBdfMfI281TzNX11zF1o1XDbqof6/aHCzsD3un7/XB+?=
 =?us-ascii?Q?d9RIz7KxUMROR1S3BRjQnElHzIyT5ZX2gEftBuwB45u8SbJxTCgD44Z36MGe?=
 =?us-ascii?Q?vAcbGSxcoGRYpjxd/7prt7+O5f2oT3jdDWK8VHDPdMMhaPByAelrblQKC0HK?=
 =?us-ascii?Q?lhEgvfFap7ab88imgDhKCl1ZE4f6MPgowN/Zw7ehkSOPF2TVmsNwPtEvy/aI?=
 =?us-ascii?Q?wgOUaOyzIvrCE883VXAmCtQlJa55T6V8wYQBAJWZP4J9yJ5DXpHMunoRcAA0?=
 =?us-ascii?Q?1W53M7F5/m4zJ+99kjXiw1gMsTy6i/OKjN53CEGGAMvJxmyDejEu3CIPNl5o?=
 =?us-ascii?Q?CneSGzYBTvcAsyMuSVzrHT68ZwefVYx3NuKVzm/YPKhSsJXKlHVV/ei7q+mO?=
 =?us-ascii?Q?ixXhb/QfuzbLK5G0gRif2yhScGWpQd0XpcfrETKZ4RmWUWqrQeRjYvWV7sAL?=
 =?us-ascii?Q?Z6pAfOHHXnhlkdu67npq3lJczUwbYcvk8gGh6ZtcUTjWy8NJtT39Vkdd0oUe?=
 =?us-ascii?Q?hw=3D=3D?=
X-OriginatorOrg: nutanix.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 15347d81-0b29-41b5-328b-08dab8c69798
X-MS-Exchange-CrossTenant-AuthSource: CH0PR02MB8041.namprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2022 09:27:11.5526
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: QwOjHUR78zBHfKraZ6fpOkWMI8/C3ntoqRIfMCaLgf0wS5uEEOcRddVUGoyRobYH5mQQBykF2AdXXkpJWO74EKir2sSg88V01EUVMM/Gr68=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR02MB7267
X-Proofpoint-GUID: GTGKS5jXsOrTzB5toHD_lPXjDZOCAPy2
X-Proofpoint-ORIG-GUID: GTGKS5jXsOrTzB5toHD_lPXjDZOCAPy2
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2022-10-28_04,2022-10-27_01,2022-06-22_01
X-Proofpoint-Spam-Reason: safe
X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,
        SPF_NONE 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Should not call eventfd_ctx_put() in case of error.

Fixes: 2fd6df2f2b47 ("KVM: x86/xen: intercept EVTCHNOP_send from guests")
Reported-by: syzbot+6f0c896c5a9449a10ded@syzkaller.appspotmail.com
Signed-off-by: Eiichi Tsukata <eiichi.tsukata@nutanix.com>
---
 arch/x86/kvm/xen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kvm/xen.c b/arch/x86/kvm/xen.c
index 93c628d3e3a9..a357994982c6 100644
--- a/arch/x86/kvm/xen.c
+++ b/arch/x86/kvm/xen.c
@@ -1716,7 +1716,7 @@ static int kvm_xen_eventfd_assign(struct kvm *kvm,
 	if (ret == -ENOSPC)
 		ret = -EEXIST;
 out:
-	if (eventfd)
+	if (eventfd && !IS_ERR(eventfd))
 		eventfd_ctx_put(eventfd);
 	kfree(evtchnfd);
 	return ret;
-- 
2.37.3