Received: by 2002:a05:6a10:6d25:0:0:0:0 with SMTP id gq37csp1858621pxb; Mon, 13 Sep 2021 07:04:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw3/9VFXdEeZaTQ7gEEtY3waeNndhIQindVvYGOikWSi+MaziGDQl5odvffI9u5Y+O8xyjs X-Received: by 2002:a17:906:942:: with SMTP id j2mr3293023ejd.303.1631541879154; Mon, 13 Sep 2021 07:04:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631541879; cv=none; d=google.com; s=arc-20160816; b=N9lpzQ2aiWbsyScJSLr7ZCGfpX/EbSQyy2IJYvHyhNP/EDtsCegpmJJI+hAS75rZeJ zBMATaCzI0hTiWzLZZDx1NIlUTOVVBP5nDpZm5v8qscvIArmdZW8TmJN7BGAUv8bznVF 1b5NLuNWF0PZUQlgT/nYrqQn/v/1T1kH2fI9/D0nYrw4igBq1e60rivJZZjGpmxx1Y/s RmWwk7srA5062r7K2kFiG88AfczYpx9ZKa73iIpD07x4gIdcc9zQc0E4zlUrhYelMF1v rmOAJ69cTU3eW5qSX6KTHl2xx8M/ec/SZHjmLHH08MOHNuXqnoxrt36YL/ME30eQeHlV yx/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=VlKemIVMOt3kEoVCWy5d+sHOzDk5m9AEY92cQ5K/ZZs=; b=0dMxciiW4crpZQOqGDz9YS5Y7jhLnfY2BOisvMVuiu5CsyYHoO3JyEnoJPs/S1xtW+ AfGY46YOctGNOqq0EdOSMnwxdlBX1/VYFxZhfxiTBNoNqeBzJQfI0FrNffgq+oyDa8AR JB5LwpOt+KWkIcqGh6eNSEfGEih6JuYuYBs6VWnemnX+NJqK7AvA70Eb2SJyooE/iLdP kmVc3uiPozvvGZ6PdppLItZQJrSFR920g/hE1tM8Qzqi0EBbuoTcNi+LvhMdoDgU8Ie0 Ytcu3Q4BKNMpCL+rCW5161UUmGM2l3+UEZv11/txMhpSXms9j1FC/aenW8hoiiAaQ1T6 QPvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1XgjCraY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id yc17si7948402ejb.381.2021.09.13.07.04.12; Mon, 13 Sep 2021 07:04:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1XgjCraY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245457AbhIMOCj (ORCPT + 99 others); Mon, 13 Sep 2021 10:02:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:50986 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343529AbhIMN7g (ORCPT ); Mon, 13 Sep 2021 09:59:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9F08B61244; Mon, 13 Sep 2021 13:37:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631540236; bh=arBhUMgIy071O92zHpDMFw21GCoEGmEvMtconCL+aPg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1XgjCraY6HVo0RONG+Xm9NJ/RN9i3guqRsb+cfP/ycHb1DClIG03FzdoobVOW4rGc gvDlhJJkjfJfPhx+LsSbgVj3R5d8NDhVmWirS+ekQyuNX7zr8imXrmCLvu9Ds5rBRh 1GVjuYXZzUJdCTOqMgPtE87ts5HCQOslYHLqAfWQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dongliang Mu , Sean Young , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.13 109/300] media: dvb-usb: Fix error handling in dvb_usb_i2c_init Date: Mon, 13 Sep 2021 15:12:50 +0200 Message-Id: <20210913131113.072141955@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913131109.253835823@linuxfoundation.org> References: <20210913131109.253835823@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dongliang Mu [ Upstream commit 131ae388b88e3daf4cb0721ed4b4cb8bfc201465 ] In dvb_usb_i2c_init, if i2c_add_adapter fails, it only prints an error message, and then continues to set DVB_USB_STATE_I2C. This affects the logic of dvb_usb_i2c_exit, which leads to that, the deletion of i2c_adap even if the i2c_add_adapter fails. Fix this by returning at the failure of i2c_add_adapter and then move dvb_usb_i2c_exit out of the error handling code of dvb_usb_i2c_init. Fixes: 13a79f14ab28 ("media: dvb-usb: Fix memory leak at error in dvb_usb_device_init()") Signed-off-by: Dongliang Mu Signed-off-by: Sean Young Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/usb/dvb-usb/dvb-usb-i2c.c | 9 +++++++-- drivers/media/usb/dvb-usb/dvb-usb-init.c | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/media/usb/dvb-usb/dvb-usb-i2c.c b/drivers/media/usb/dvb-usb/dvb-usb-i2c.c index 2e07106f4680..bc4b2abdde1a 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-i2c.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-i2c.c @@ -17,7 +17,8 @@ int dvb_usb_i2c_init(struct dvb_usb_device *d) if (d->props.i2c_algo == NULL) { err("no i2c algorithm specified"); - return -EINVAL; + ret = -EINVAL; + goto err; } strscpy(d->i2c_adap.name, d->desc->name, sizeof(d->i2c_adap.name)); @@ -27,11 +28,15 @@ int dvb_usb_i2c_init(struct dvb_usb_device *d) i2c_set_adapdata(&d->i2c_adap, d); - if ((ret = i2c_add_adapter(&d->i2c_adap)) < 0) + ret = i2c_add_adapter(&d->i2c_adap); + if (ret < 0) { err("could not add i2c adapter"); + goto err; + } d->state |= DVB_USB_STATE_I2C; +err: return ret; } diff --git a/drivers/media/usb/dvb-usb/dvb-usb-init.c b/drivers/media/usb/dvb-usb/dvb-usb-init.c index 28e1fd64dd3c..61439c8f33ca 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-init.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-init.c @@ -194,8 +194,8 @@ static int dvb_usb_init(struct dvb_usb_device *d, short *adapter_nums) err_adapter_init: dvb_usb_adapter_exit(d); -err_i2c_init: dvb_usb_i2c_exit(d); +err_i2c_init: if (d->priv && d->props.priv_destroy) d->props.priv_destroy(d); err_priv_init: -- 2.30.2