Received: by 10.192.165.156 with SMTP id m28csp1163155imm; Wed, 11 Apr 2018 13:39:25 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/mp3RtaVnw0iMP5LeZk+fe5G2scurYMt8USEx/9DXuMh8T1DXHfQCXiOwLRBUtlwzwg966 X-Received: by 2002:a17:902:69ce:: with SMTP id m14-v6mr6737082pln.358.1523479165462; Wed, 11 Apr 2018 13:39:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523479165; cv=none; d=google.com; s=arc-20160816; b=hV9uX6gG/ImWo3eB1cFRNWZDqu2k7+gotHaX9FNxCtgT65W+8zvUXFeaz55qLQgNUc wCu6Pza5y4NXBc2iau9JApLy896VmeBK+CiTACP/2502YGgdFkWEdsyYAZ3yv8zhiht9 +FNw4F5mJ8ZXQnW8sXG/TesMfShIYYUbFrljR5YHtgP0/qNmafrs9HG1AMC7CQs+HTVS cCga0/rmtTnM8cp9nhXOSp2jzsSmLo9HFswFQKJPV2vQk9sI5pS/dXiw8bFToECbVP7X 94UyuEa2vQnkHKCTk/SfqJJqPKQjRH54dhPoTmXD4kGGsZK/daedJ18bKIXNOUSvWQJc lUAw== 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=P/cDHo51mYzTyjm2pwTILD7jXm1NRkV3HsOo1QCaoAk=; b=GDQd7Npp2EyfAlqGSgdaSuOxQOCKy8DsAYgsGm9C+SE2YvNN6MSIueEHDoG5qMbcY7 PSbgEHjggTXDEd6EBtjVrHogBc0ChP+nZ2XEHQ7Dx9BqchOCvCaewZazrKxqphpgJwGh j295/iPUg8lEZhqp1wrxX5T3dVj9QU7ZZcOO7CmL7NLu6AHafqit0YNrGH3wLg2jjsjg G//i+WgLUA7kcDiYBSdBPnR6ixbhz+K5yLdKiA83AWAW7cZiHg9EqIU6MoFv9aMotFA9 TX94dk/tYmfa70Yo8uIstIEd8sKgP8vf6cyTEi/HmYdaUNJd3jo7QFJo+7G8dLn2szde zdZA== 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 31-v6si1757792plj.703.2018.04.11.13.38.49; Wed, 11 Apr 2018 13:39:25 -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 S932637AbeDKUdj (ORCPT + 99 others); Wed, 11 Apr 2018 16:33:39 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:60002 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932440AbeDKStH (ORCPT ); Wed, 11 Apr 2018 14:49:07 -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 B2C4CE44; Wed, 11 Apr 2018 18:49:06 +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.4 125/190] [media] cx25840: fix unchecked return values Date: Wed, 11 Apr 2018 20:36:11 +0200 Message-Id: <20180411183559.391845365@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183550.114495991@linuxfoundation.org> References: <20180411183550.114495991@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.4-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); @@ -631,11 +633,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. @@ -746,11 +750,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);