Received: by 10.192.165.156 with SMTP id m28csp1112468imm; Wed, 11 Apr 2018 12:39:22 -0700 (PDT) X-Google-Smtp-Source: AIpwx491t72kB8Jo9E1y1f1kttHXoESI0qLWReWiTrhOxBPC/uLr3YJp1ki/6n5fNMW+mJqGa2Nf X-Received: by 10.98.226.24 with SMTP id a24mr5082015pfi.223.1523475562900; Wed, 11 Apr 2018 12:39:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523475562; cv=none; d=google.com; s=arc-20160816; b=BE67Yf+CFU6rLXcVT9E4nKDi2h8V4nE2Bbmb+RbffxPOxOTFHkhU2/GcgByp1W6xTX hM8kTSoCqEhQl7IFOtmsaMdSmwWrNv5Sk+vQ0cpb/VdVtMJxQmKw7Njs3H6+SKIDDVs3 ubE0S14nUTQN4TFXlv68kA724eWZN/1hpDof9V4+3v12jhmzXQeNhnog9SmzUAT4s9tm PU0mX77s1sqQObS3AJgmBjLGbLWnXEnocfsDD6eIbS3D9jrCs+4FXlyEoZXnL8PEYip7 K1vZNxYF2V3N1AIFo33dB68+s0qzPG4oHmVlVupoLxfq8ROPEk5I8DJOqRtCGL9JAclA 9Clw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=L9VG2k7cf79AgRWzruQNBYf0EC8OlyPs3ESdfJHkXKQ=; b=KB5s9h+iXNfFNeVHan4FTVj7Uyo/vh7NjDCV8M+/c9oD0SnZpq5S2MLuV04uX5C97d 2voldPxak7yaTgGVuhUkXphoeqKnFgcT6cirsWLR2PSob8AB+aFpenZkv4Oxv1EkTb26 8H7gsN97Ngd4wzOGSvtrD0UWyvbDGbOoT1zAdBTrH8GDDHeAwWYeWhJZAC7fvaPnOFfw Hcu5HCSzisFXw6lk9AROaVhLSCZ1doq3uTAmBj0AXiqdxIucxnD/nBDfhwhH+02Dz5vp Y5VOmOWwEK8cBOaWvhEOHfIvHUEbt2z3KT8la2MTO3Cv6jbVtKbuUx/v9N/yAF+CbSjs RIOA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q10-v6si1650590plr.680.2018.04.11.12.38.46; Wed, 11 Apr 2018 12:39:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934432AbeDKTCR (ORCPT + 99 others); Wed, 11 Apr 2018 15:02:17 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:38446 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934397AbeDKTCM (ORCPT ); Wed, 11 Apr 2018 15:02:12 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 2B54BE30; Wed, 11 Apr 2018 19:02:12 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pan Bian , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.9 208/310] [media] cx25840: fix unchecked return values Date: Wed, 11 Apr 2018 20:35:47 +0200 Message-Id: <20180411183631.517331710@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183622.305902791@linuxfoundation.org> References: <20180411183622.305902791@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pan Bian [ Upstream commit 35378ce143071c2a6bad4b59a000e9b9f8f6ea67 ] In functions cx25840_initialize(), cx231xx_initialize(), and cx23885_initialize(), the return value of create_singlethread_workqueue() is used without validation. This may result in NULL dereference and cause kernel crash. This patch fixes it. Signed-off-by: Pan Bian Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/media/i2c/cx25840/cx25840-core.c | 36 ++++++++++++++++++------------- 1 file changed, 21 insertions(+), 15 deletions(-) --- a/drivers/media/i2c/cx25840/cx25840-core.c +++ b/drivers/media/i2c/cx25840/cx25840-core.c @@ -420,11 +420,13 @@ static void cx25840_initialize(struct i2 INIT_WORK(&state->fw_work, cx25840_work_handler); init_waitqueue_head(&state->fw_wait); q = create_singlethread_workqueue("cx25840_fw"); - prepare_to_wait(&state->fw_wait, &wait, TASK_UNINTERRUPTIBLE); - queue_work(q, &state->fw_work); - schedule(); - finish_wait(&state->fw_wait, &wait); - destroy_workqueue(q); + if (q) { + prepare_to_wait(&state->fw_wait, &wait, TASK_UNINTERRUPTIBLE); + queue_work(q, &state->fw_work); + schedule(); + finish_wait(&state->fw_wait, &wait); + destroy_workqueue(q); + } /* 6. */ cx25840_write(client, 0x115, 0x8c); @@ -634,11 +636,13 @@ static void cx23885_initialize(struct i2 INIT_WORK(&state->fw_work, cx25840_work_handler); init_waitqueue_head(&state->fw_wait); q = create_singlethread_workqueue("cx25840_fw"); - prepare_to_wait(&state->fw_wait, &wait, TASK_UNINTERRUPTIBLE); - queue_work(q, &state->fw_work); - schedule(); - finish_wait(&state->fw_wait, &wait); - destroy_workqueue(q); + if (q) { + prepare_to_wait(&state->fw_wait, &wait, TASK_UNINTERRUPTIBLE); + queue_work(q, &state->fw_work); + schedule(); + finish_wait(&state->fw_wait, &wait); + destroy_workqueue(q); + } /* Call the cx23888 specific std setup func, we no longer rely on * the generic cx24840 func. @@ -752,11 +756,13 @@ static void cx231xx_initialize(struct i2 INIT_WORK(&state->fw_work, cx25840_work_handler); init_waitqueue_head(&state->fw_wait); q = create_singlethread_workqueue("cx25840_fw"); - prepare_to_wait(&state->fw_wait, &wait, TASK_UNINTERRUPTIBLE); - queue_work(q, &state->fw_work); - schedule(); - finish_wait(&state->fw_wait, &wait); - destroy_workqueue(q); + if (q) { + prepare_to_wait(&state->fw_wait, &wait, TASK_UNINTERRUPTIBLE); + queue_work(q, &state->fw_work); + schedule(); + finish_wait(&state->fw_wait, &wait); + destroy_workqueue(q); + } cx25840_std_setup(client);