Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp2834000pxv; Mon, 12 Jul 2021 03:05:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxnPTZAc7jt8eHXnh0MTrWmG/bpliC0odjonylYOlSfDxosYkRafcLdXX/OYazCH0/tw7OZ X-Received: by 2002:a02:93a3:: with SMTP id z32mr12819623jah.33.1626084348554; Mon, 12 Jul 2021 03:05:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626084348; cv=none; d=google.com; s=arc-20160816; b=J/mlv6Xnh+8IztaTONEQRONZj7SieY4RjS44HD5YM8pVWfaNNlAGFVx8pclpdoDRaL /zDSF/1YJHrvQIz1yT3RyrX+GON+k5jwBT0qhk60XJldLhGhq+a9CL1xmXuJPte9S23F pidWGURziuVoQXgZpo5D6TRuCoAmiAb8z0Qkcz84g+pXgbAtGSnKpkNyEH2EQDbEHKmo W+GOAoro9RQ47ylD6m4SoFRyYJwN3QoOyK+RFKhPmxiSt2ONKhcZ5ERk5WTFAMya0UkJ 7i3rhlbb+J9rQB2QyNdkXFiF6YSOWqy8RvrpyTybJz7cs3cgfpHHYlkZnsFQq8rWCW6f aMYQ== 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=NI1iffrmsWyyVTrx3HKgyI8JhTJ2fEaafNywOKFiOZU=; b=a+DgN6ayQjjP1u221wCc5nVcMkz0xDRR9nGRCGOMkJJMT8iUZMiyZYvZ4pi92RXF54 pXRT46uxnjI251hMhriUKXp7nezf4vE2YHrXP23rQ3LK7UY8VZia2h6PdugQj2XhdIjz wfOaqUSKiC0cshmxb/br8qLrAyuprazH5L5Zcq0wJ75m+hAg3pVIkQTiO1xPFEWXoCh8 VhiY3Oqwm+5ensq7zDXZi41GB0YVBcS56kM5KohSK6FdhL0jRHHUnwUYlHmLL2vbB0GY mZ9p500Rm5wxVthg7fYE1r7Wo0fENpQJ49xeP6AlOGK5vJ+tzDCHHTeqB2lIDABZhPzL weeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="YcloIH/N"; 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 i23si18083590jav.3.2021.07.12.03.05.37; Mon, 12 Jul 2021 03:05:48 -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="YcloIH/N"; 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 S245483AbhGLH1I (ORCPT + 99 others); Mon, 12 Jul 2021 03:27:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:56792 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241694AbhGLG7W (ORCPT ); Mon, 12 Jul 2021 02:59:22 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7C22D61132; Mon, 12 Jul 2021 06:56:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626072995; bh=Ru1cFwAisZX2OkWc/Qtz8kW4OtZkqIpfQozWMLIy3CE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YcloIH/N+YwqXbftaeao9iJ561QIbUcaPwPL7Qiuy3Jc1asC+0dhqUGsHmLDQUcte JwztzkTqkw4i9ATuzg8JxYmEhpZLOC4/oUjjSKtwDVE1gWEF6mtWjhCnPDtm7+F7L0 DscbLT/GMk8HIC5Ja0jlQPn7Kd5Oz+qSMeRn2qX0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jeremy Cline , Hans de Goede , Andy Shevchenko , Stable@vger.kernel.org, Jonathan Cameron Subject: [PATCH 5.12 092/700] iio: accel: bmc150: Fix dereferencing the wrong pointer in bmc150_get/set_second_device Date: Mon, 12 Jul 2021 08:02:55 +0200 Message-Id: <20210712060937.764803550@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060924.797321836@linuxfoundation.org> References: <20210712060924.797321836@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: Hans de Goede commit f2bf22dc9ea8ead180fc0221874bd556bf1d2685 upstream. The drvdata for iio-parent devices points to the struct iio_dev for the iio-device. So by directly casting the return from i2c_get_clientdata() to struct bmc150_accel_data * the code was ending up storing the second_dev pointer in (and retrieving it from) some semi-random offset inside struct iio_dev, rather then storing it in the second_dev member of the bmc150_accel_data struct. Fix the code to get the struct bmc150_accel_data * pointer to call iio_priv() on the struct iio_dev * returned by i2c_get_clientdata(), so that the correct pointer gets dereferenced. This fixes the following oops on rmmod, caused by trying to dereference the wrong return of bmc150_get_second_device(): [ 238.980737] BUG: unable to handle page fault for address: 0000000000004710 [ 238.980755] #PF: supervisor read access in kernel mode [ 238.980760] #PF: error_code(0x0000) - not-present page ... [ 238.980841] i2c_unregister_device.part.0+0x19/0x60 [ 238.980856] 0xffffffffc0815016 [ 238.980863] i2c_device_remove+0x25/0xb0 [ 238.980869] __device_release_driver+0x180/0x240 [ 238.980876] driver_detach+0xd4/0x120 [ 238.980882] bus_remove_driver+0x5b/0xd0 [ 238.980888] i2c_del_driver+0x44/0x70 While at it also remove the now no longer sensible checks for data being NULL, iio_priv never returns NULL for an iio_dev with non 0 sized private-data. Fixes: 5bfb3a4bd8f6 ("iio: accel: bmc150: Check for a second ACPI device for BOSC0200") Cc: Jeremy Cline Signed-off-by: Hans de Goede Reviewed-by: Andy Shevchenko Cc: Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman --- drivers/iio/accel/bmc150-accel-core.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) --- a/drivers/iio/accel/bmc150-accel-core.c +++ b/drivers/iio/accel/bmc150-accel-core.c @@ -1805,10 +1805,7 @@ EXPORT_SYMBOL_GPL(bmc150_accel_core_prob struct i2c_client *bmc150_get_second_device(struct i2c_client *client) { - struct bmc150_accel_data *data = i2c_get_clientdata(client); - - if (!data) - return NULL; + struct bmc150_accel_data *data = iio_priv(i2c_get_clientdata(client)); return data->second_device; } @@ -1816,10 +1813,9 @@ EXPORT_SYMBOL_GPL(bmc150_get_second_devi void bmc150_set_second_device(struct i2c_client *client) { - struct bmc150_accel_data *data = i2c_get_clientdata(client); + struct bmc150_accel_data *data = iio_priv(i2c_get_clientdata(client)); - if (data) - data->second_device = client; + data->second_device = client; } EXPORT_SYMBOL_GPL(bmc150_set_second_device);