From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0CD4C43381 for ; Thu, 21 Feb 2019 14:51:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 85D9720700 for ; Thu, 21 Feb 2019 14:51:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550760663; bh=HxZG9l8KvI1W4a3dp/yYKV1Wm48qUbbKN2WDQYRkkHU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oatAEJX6VEWMFQzSzASH3aAQU7HZGR2IfmtYZ3WvuaBkLe/tMYIgv4W/bI9sx/Nth tQfCuf0ql2H0Cx3P45Ww51ooQVa6bvQcMGTF60Ua0v1L1AJXLuxt97oL9/0rBmBBdI YmLEdD7JdmlTlp6KlyLzxxYsuFfPwL6OkyQFYfs0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728530AbfBUOhz (ORCPT ); Thu, 21 Feb 2019 09:37:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:59362 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728492AbfBUOhy (ORCPT ); Thu, 21 Feb 2019 09:37:54 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 360A92075C; Thu, 21 Feb 2019 14:37:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550759873; bh=HxZG9l8KvI1W4a3dp/yYKV1Wm48qUbbKN2WDQYRkkHU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L/40VUqa/smMOgFvSePoASdUfyNKtDWM/iOOeW04TeajbqdoGAuJp0ohf7iWhkE5z sUnYEeN6XCvfYjL1ubfqV1nVhTYJY+7GVx8Wrw7Ol/3246iAF6iMXcPSrH7R2p0QAL I7nbLcQXJ+PUkddkduGu7hwJumEi5sfH3i10A/SY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xiumei Mu , Paolo Abeni , Stefano Garzarella , Jorgen Hansen , "David S. Miller" , Sasha Levin Subject: [PATCH 4.4 02/20] vsock: cope with memory allocation failure at socket creation time Date: Thu, 21 Feb 2019 15:35:32 +0100 Message-Id: <20190221141946.847448508@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190221141946.772985220@linuxfoundation.org> References: <20190221141946.772985220@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 225d9464268599a5b4d094d02ec17808e44c7553 ] In the unlikely event that the kmalloc call in vmci_transport_socket_init() fails, we end-up calling vmci_transport_destruct() with a NULL vmci_trans() and oopsing. This change addresses the above explicitly checking for zero vmci_trans() at destruction time. Reported-by: Xiumei Mu Fixes: d021c344051a ("VSOCK: Introduce VM Sockets") Signed-off-by: Paolo Abeni Reviewed-by: Stefano Garzarella Reviewed-by: Jorgen Hansen Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/vmw_vsock/vmci_transport.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c index d24773552b641..217810674c358 100644 --- a/net/vmw_vsock/vmci_transport.c +++ b/net/vmw_vsock/vmci_transport.c @@ -1656,6 +1656,10 @@ static void vmci_transport_cleanup(struct work_struct *work) static void vmci_transport_destruct(struct vsock_sock *vsk) { + /* transport can be NULL if we hit a failure at init() time */ + if (!vmci_trans(vsk)) + return; + /* Ensure that the detach callback doesn't use the sk/vsk * we are about to destruct. */ -- 2.19.1