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.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 0A192C28CC1 for ; Thu, 30 May 2019 03:18:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CD11E2479B for ; Thu, 30 May 2019 03:18:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186299; bh=PXskwP5my7LYhHMGycl5qGICLGQxqOlvynyoXfbl5bE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ealjVj7/+TDiRWEXXbpfYHMHYSCysfsWs1FCiUVYQ3mMbMjBFBpUT6z2r5I48Ln0b KXKyRkGNOFa8f2CukC6J5I02WPgjoP7IHugLEOjS0yvNwNX25SAEFFyT8gWqZhRrq9 K5/eyCsEsHoa9P059fxfZjUdeuk1lnmo/jxjZJBE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731508AbfE3DST (ORCPT ); Wed, 29 May 2019 23:18:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:50684 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731504AbfE3DSS (ORCPT ); Wed, 29 May 2019 23:18:18 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (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 D233624787; Thu, 30 May 2019 03:18:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186297; bh=PXskwP5my7LYhHMGycl5qGICLGQxqOlvynyoXfbl5bE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rzr90JcXHuJ/wFM992llLdJ93L5Vr9B9FNi0s3tLsH/7S5F2wp59v42m15xx+AIys L4TWyrX4vXt96QAh2DC7rDIK/rGWNZ1oS4SMBsXfr9QQGDJeHeq7DllbS6EZUyeCQs QabcSW97Cge4AYvzEsLtHsN4McCfrPs3O+sd1XtE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Aditya Pakki , Mukesh Ojha , Mika Westerberg , Sasha Levin Subject: [PATCH 4.19 225/276] thunderbolt: Fix to check the return value of kmemdup Date: Wed, 29 May 2019 20:06:23 -0700 Message-Id: <20190530030539.178954010@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030523.133519668@linuxfoundation.org> References: <20190530030523.133519668@linuxfoundation.org> User-Agent: quilt/0.66 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 [ Upstream commit fd21b79e541e4666c938a344f3ad2df74b4f5120 ] uuid in add_switch is allocted via kmemdup which can fail. The patch logs the error and cleans up the allocated memory for switch. Signed-off-by: Aditya Pakki Reviewed-by: Mukesh Ojha Signed-off-by: Mika Westerberg Signed-off-by: Sasha Levin --- drivers/thunderbolt/icm.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/thunderbolt/icm.c b/drivers/thunderbolt/icm.c index 28fc4ce75edb4..8490a1b6b6156 100644 --- a/drivers/thunderbolt/icm.c +++ b/drivers/thunderbolt/icm.c @@ -476,6 +476,11 @@ static void add_switch(struct tb_switch *parent_sw, u64 route, goto out; sw->uuid = kmemdup(uuid, sizeof(*uuid), GFP_KERNEL); + if (!sw->uuid) { + tb_sw_warn(sw, "cannot allocate memory for switch\n"); + tb_switch_put(sw); + goto out; + } sw->connection_id = connection_id; sw->connection_key = connection_key; sw->link = link; -- 2.20.1