From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752513AbcCGMWi (ORCPT ); Mon, 7 Mar 2016 07:22:38 -0500 Received: from mx0b-001ae601.pphosted.com ([67.231.152.168]:48156 "EHLO mx0b-001ae601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751146AbcCGMWa (ORCPT ); Mon, 7 Mar 2016 07:22:30 -0500 Authentication-Results: ppops.net; spf=pass smtp.mail=Brian.Austin@cirrus.com From: "Austin, Brian" To: Arnd Bergmann CC: Mark Brown , "Austin, Brian" , "Handrigan, Paul" , Liam Girdwood , "alsa-devel@alsa-project.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH] ASoC: cs35l32: avoid uninitialized variable access Thread-Topic: [PATCH] ASoC: cs35l32: avoid uninitialized variable access Thread-Index: AQHReCij5n32gF7nukGZFpl/WI0yJZ9OTD2A Date: Mon, 7 Mar 2016 12:22:18 +0000 Message-ID: References: <1457324374-3405023-1-git-send-email-arnd@arndb.de> In-Reply-To: <1457324374-3405023-1-git-send-email-arnd@arndb.de> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [141.131.20.46] Content-Type: text/plain; charset="utf-8" Content-ID: MIME-Version: 1.0 X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 include:spf-001ae601.pphosted.com ip4:141.131.128.20 ip4:141.131.3.20 ip4:213.128.236.230 ip4:87.246.98.25 ip4:87.246.78.26 -all X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1601100000 definitions=main-1603070232 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id u27CMgHJ013098 > On Mar 6, 2016, at 10:19 PM, Arnd Bergmann wrote: > > gcc warns about the possibilty of accessing a property read from > devicetree in cs35l32_i2c_probe() when it has not been initialized > because CONFIG_OF is disabled: > > sound/soc/codecs/cs35l32.c: In function 'cs35l32_i2c_probe': > sound/soc/codecs/cs35l32.c:278:2: warning: 'val' may be used uninitialized in this function [-Wmaybe-uninitialized] > > The code is actually correct because it checks the dev->of_node > variable first and we know this is NULL here when CONFIG_OF > is disabled, but Russell King noticed that it's broken when > we probe the device using DT, and the properties are absent. > > The code already has some checking for incorrect values, and > I keep that checking unchanged here, but add an additional > check for an error returned by the property accessor functions > that now gets handled the same way as incorrect data in the > properties. > > Signed-off-by: Arnd Bergmann > --- > sound/soc/codecs/cs35l32.c | 17 ++++++++++++----- > 1 file changed, 12 insertions(+), 5 deletions(-) > > diff --git a/sound/soc/codecs/cs35l32.c b/sound/soc/codecs/cs35l32.c > index 44c30fe3e315..c490dc74121b 100644 > --- a/sound/soc/codecs/cs35l32.c > +++ b/sound/soc/codecs/cs35l32.c > @@ -274,21 +274,24 @@ static int cs35l32_handle_of_data(struct i2c_client *i2c_client, > if (of_property_read_u32(np, "cirrus,sdout-share", &val) >= 0) > pdata->sdout_share = val; > > - of_property_read_u32(np, "cirrus,boost-manager", &val); > + if (of_property_read_u32(np, "cirrus,boost-manager", &val)) > + val = -1u; > + > switch (val) { > case CS35L32_BOOST_MGR_AUTO: > case CS35L32_BOOST_MGR_AUTO_AUDIO: > case CS35L32_BOOST_MGR_BYPASS: > case CS35L32_BOOST_MGR_FIXED: > - pdata->boost_mng = val; With this one line removed won’t that keep from assigning the value for later? The other ones don’t seem to do this but just check for bad value. > break; > + case -1u: > default: > dev_err(&i2c_client->dev, > "Wrong cirrus,boost-manager DT value %d\n", val); > pdata->boost_mng = CS35L32_BOOST_MGR_BYPASS; > } > Regards, Brian