Received: by 10.192.165.156 with SMTP id m28csp1197071imm; Wed, 11 Apr 2018 14:21:43 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+bEoLLVn/0BNc0gOZyXkuw4njvvmgZsxx33IAwNq3IBhDJLVbaM4cH9Qgzl398sDVJWCPB X-Received: by 10.98.14.7 with SMTP id w7mr5378886pfi.50.1523481702973; Wed, 11 Apr 2018 14:21:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523481702; cv=none; d=google.com; s=arc-20160816; b=QBLXRH/fzdpaykvD12QoY+rjdNS69xVZMLkMlGzEz3MPc/QhxI2q+UsSYKvd67j9rZ 24Vxf+RDKo3qcIJW9uLk0X+fGTEyE/a1MiyVPVGPrOmWb/5F9C/F8hKFfw+5yfCju8/i bk5c7yvArjsOUckGniMH02ZhBRMO94hc6bxFWdzI9Hb+5WxTBAV21Earz+QX7ugd2wBh buBPcUwy1UhkHXwkuXLik9vyIvcKUAhypzm1ZajUo76A93yNAhttJ08XZJp30Mebw31R 5V38EXDpMr8pZF6bmd3dQlwiD4ZCHUCqrZJi831SbERNPnp4JFbMeeXN/wBf/ldk8+2i P/5Q== 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=Gys1sdR2NnQSmuqcWjROQWSemgrP0HWMSptPkphUja8=; b=mgtx/k1C8XFkZxOII56Px0gSoYn8DwLZonSjcmhffOyBfHnjd1+NClgcRJJ8nyGq/q fHBmgx/1FUByfy8gPOaDne7wV0E1al6WsGji12gBSun0krGQYWSNcLKLSgnzNjmTouzq jq3wjIJ4NPGP+7/P9elXfqqnbW5VKz9wG3nxZ4ogJlWbDoaNgxEb6CWx0QAGlzOchE2T FEuiRr9ol2Ipf7EfgTrW9sYp++soiCskBD+O4HTrLjCY6yGvAPjcexwjgS/iixVOywKB MMD9jYONtcNcN26I2wwDz8A0jZTozOLyCJtaDzqoFz7Blgu+0qAlHQa8CEUlo3ShsOIk SbyA== 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 p7si1215430pgq.8.2018.04.11.14.20.56; Wed, 11 Apr 2018 14:21:42 -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 S1755255AbeDKVO2 (ORCPT + 99 others); Wed, 11 Apr 2018 17:14:28 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:56654 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754751AbeDKSlB (ORCPT ); Wed, 11 Apr 2018 14:41:01 -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 32ECCDC2; Wed, 11 Apr 2018 18:41:01 +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 3.18 072/121] [media] cx25840: fix unchecked return values Date: Wed, 11 Apr 2018 20:36:15 +0200 Message-Id: <20180411183500.538216736@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183456.195010921@linuxfoundation.org> References: <20180411183456.195010921@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 3.18-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);