From patchwork Thu Mar 1 15:27:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130273 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2951827edc; Thu, 1 Mar 2018 07:38:02 -0800 (PST) X-Google-Smtp-Source: AG47ELu02cCYIqgs65eb7M0U9LmT85NEmY8pXXbPLA+Ngn7Tk36Ou1tD1oz87j3zJ0dRWyCJM1qi X-Received: by 10.101.81.4 with SMTP id f4mr1959322pgq.30.1519918682806; Thu, 01 Mar 2018 07:38:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519918682; cv=none; d=google.com; s=arc-20160816; b=cKAPzach39eigITKOh7fHUpUkiwMTG1aYv3V0yZxAz12sGqnm52sBeabKDk3sSst0t UkzRyBh6LakDaGn8XDjYYDkLOYBcXG6Av6LCK8hF2NAp+AC8DJ2P4MF9vU4HtPQfSdjV btV6N5Vaog11a8sTu4sDKaFykuCzv4J7nJyRgmGxuBiGKunMlTO1zrfVtdAQfbevxwtL wpS6wDD70nhUU5eqHgYRhdr4VhThCTdgcCYiJojg4QBaDfUEOrMWTUc6v5/yIS7mWVO9 OQIhHf3rvPk4xy3XhQhHmW5gGvJ4k5DCEGyQ+vUA7Ukv8Le4mNPnpzsymswW41DQiuqK PWhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=DrDSaq2DCjHmSEpJSoi/mHDGbCRSXLLB7DarHI+RuPY=; b=F0+aHnNO2h2wf0+uSajSgD60aoZmf69aw4IlnyxyplzNe5OMO2Xt9KLN5bD53FuwNu lEmyHIcZSa8xuYrlM1a/pxjIaqRXjFeTCmlZdWqDACgzeGxi85IyJK2QhikqkTiRjUPJ 90BbflL4+qtU13bzOqd/3wRO+yt1189RvURds71YjCMtQ01i5XZtfTbnWbKlSmgChrks Asc8LI+TXKciJMAXfHEjDLqRH5DP1HqnDN7pI8YFlZaaMRDvsHLv8Mk/TT9a0YWbshQR c3NtXtTpUK+ucI3J9RVP1+7gg2aXFhxHvJMM3kZxhZBbToGdZMtoW+aJezs62RPWR06N fccQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=dRxhq7P5; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g10-v6si2863008plk.730.2018.03.01.07.38.02; Thu, 01 Mar 2018 07:38:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=dRxhq7P5; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1032534AbeCAPhy (ORCPT + 10 others); Thu, 1 Mar 2018 10:37:54 -0500 Received: from mail-cys01nam02on0129.outbound.protection.outlook.com ([104.47.37.129]:45715 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032528AbeCAPhs (ORCPT ); Thu, 1 Mar 2018 10:37:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=DrDSaq2DCjHmSEpJSoi/mHDGbCRSXLLB7DarHI+RuPY=; b=dRxhq7P50daYsyUQg0xN9KjkboSeVMo0YXq9RDY7GWCTcl+LyWvdjB0hoaBb5UOlSWbp6aaSktawvfYn0f67BWVuaqe3/1oOQ257sXfRyYHmkdf3djoN68Gk9Ka3lbUmhO1pKVoJMwyOiMFjJjy3LXqCPjOpjJBa44wEgM6KwWw= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1014.namprd21.prod.outlook.com (52.132.133.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.567.3; Thu, 1 Mar 2018 15:37:43 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0567.006; Thu, 1 Mar 2018 15:37:43 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Arnd Bergmann , Takashi Iwai , Sasha Levin Subject: [added to the 4.1 stable tree] ALSA: hda/ca0132 - fix possible NULL pointer use Thread-Topic: [added to the 4.1 stable tree] ALSA: hda/ca0132 - fix possible NULL pointer use Thread-Index: AQHTsXHEu1/zYIR7UEmZz+Yo59GLwA== Date: Thu, 1 Mar 2018 15:27:10 +0000 Message-ID: <20180301152116.1486-438-alexander.levin@microsoft.com> References: <20180301152116.1486-1-alexander.levin@microsoft.com> In-Reply-To: <20180301152116.1486-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB1014; 6:fRts3JV2nl1XsCimVH5bumwN1HvnD+0ffIxefzayKfkGpcgsPyKtSsBZ9f4m+/mgnz/3NMulWvQF/PG3RXyp+hZI9lLu6QyE9hM4zdvn6R0oXFWB7mo9q2GsAidQoNcsH9i8fg/GT0EYD5TNTS0yTXdHi/LD+rAcu6uGxeJ+Smf/5ZiNVmc0f6Rk51kXq9HE7ksGqrZslpEoVB6JALawots9xIsc2OJkW2WcRaYIcu34Adq39CNunyXcboA9ToOvPdxv9JiMT7wzyMd27gg0CZSd6Z84a0rIehTVxKKmSq8/9YjR3vSwaUbb5tdy1920PV1UyaSHW6lNS/nX6DBfFEVgzxyYjGqtOZblsoOFqodWPSQKh0xlwnflnT9FPyi9; 5:mD3ZpBzRK+PyROERE5VuaP2qYaorAmxPRXXLHLj/5c8IZQ3YOWIV15h3Vu6XnBlcN3k7D69H2zbVd5ZKhH8RDotEfCWt9eTieY8Uy0OawPrQlgRpmngAVNB2EuTW2MbRQcTAvZYBLuZpNj85yVjixVgIzXAxMxcXACGBFXQoJHo=; 24:NHlKpn49NMzyHuD41gpHyhKp+dA5gEAS7KJDzZneFfgp3rxwCinsmiH41R27zDjP74JPc5R7cbrn47rnC7q9fA8nyvK+J4iFNLAAjGoIwtI=; 7:/d0cjKI5qZ2YXzqUFXuLNxl9vOA63qHVOYUh5PR+g3HPSdRzbIS4XQT3/r7btvdv1zc0Ce9hLpVmEXl3RyUOKwwyipcd+EPm+MDJ+U6DgpXLgJF6ezJAj9CWuKH+BN5vZas0+uFCcxrlTVglV1XzzxhX+nWPdKOv8PIWPNJR5D+w2E/t2aFhBGUQ0dNRZWZYvuHjzSZhVLrNISreu/hmI++kGbpAm2B/+jFxwp+JxkO7cHYOLsgwgZam3pS9ThpY x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 74f54fb5-5106-434a-6785-08d57f8a5fe8 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020); SRVR:DM5PR2101MB1014; x-ms-traffictypediagnostic: DM5PR2101MB1014: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(8121501046)(5005006)(3231220)(944501228)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR2101MB1014; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1014; x-forefront-prvs: 05986C03E0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(39380400002)(346002)(39860400002)(376002)(396003)(199004)(189003)(53936002)(2906002)(3280700002)(6436002)(6486002)(3846002)(6512007)(2900100001)(6116002)(2950100002)(107886003)(6666003)(72206003)(5660300001)(36756003)(10090500001)(3660700001)(14454004)(7736002)(305945005)(97736004)(1076002)(22452003)(26005)(6506007)(105586002)(86362001)(59450400001)(478600001)(68736007)(102836004)(4326008)(6346003)(54906003)(110136005)(81156014)(81166006)(86612001)(8936002)(186003)(10290500003)(8676002)(76176011)(316002)(2501003)(66066001)(25786009)(5250100002)(106356001)(99286004)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1014; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: 0Ijqx29C8sGHLsGkJFC7RtiZXlusm4+vIu0zDRGcN6c0jgywfJQxjJAZ8JJXGjnF9+Y8i8lqZJInTtj7Wa1wu56GMMaNr4k6l+OeYwOS0Nx0DBxAT+IOTLNuEceI+xhok8Ho6PipgqJp3f1AVg/jZDglTem7Avm0UjhczOcBs7A= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 74f54fb5-5106-434a-6785-08d57f8a5fe8 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 15:27:10.6334 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1014 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann This patch has been added to the 4.1 stable tree. If you have any objections, please let us know. -- 2.14.1 =============== [ Upstream commit 46a049dae771b95e77ac6c823330f4a60f600236 ] gcc-7 caught what it considers a NULL pointer dereference: sound/pci/hda/patch_ca0132.c: In function 'dspio_scp.constprop': sound/pci/hda/patch_ca0132.c:1487:4: error: argument 1 null where non-null expected [-Werror=nonnull] This is plausible from looking at the function, as we compare 'reply' to NULL earlier in it. I have not tried to analyze if there are constraints that make it impossible to hit the bug, but adding another NULL check in the end kills the warning and makes the function more robust. Signed-off-by: Arnd Bergmann Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/pci/hda/patch_ca0132.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index 0374bd5b61c8..1fb951225318 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -1452,6 +1452,9 @@ static int dspio_scp(struct hda_codec *codec, } else if (ret_size != reply_data_size) { codec_dbg(codec, "RetLen and HdrLen .NE.\n"); return -EINVAL; + } else if (!reply) { + codec_dbg(codec, "NULL reply\n"); + return -EINVAL; } else { *reply_len = ret_size*sizeof(unsigned int); memcpy(reply, scp_reply.data, *reply_len);