From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E085C43381 for ; Thu, 28 Mar 2019 11:52:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 643EC20700 for ; Thu, 28 Mar 2019 11:52:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726266AbfC1LwL (ORCPT ); Thu, 28 Mar 2019 07:52:11 -0400 Received: from mga12.intel.com ([192.55.52.136]:59094 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725779AbfC1LwL (ORCPT ); Thu, 28 Mar 2019 07:52:11 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Mar 2019 04:52:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,280,1549958400"; d="scan'208";a="159196620" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 28 Mar 2019 04:52:09 -0700 From: Heikki Krogerus To: Greg KH Cc: Hans de Goede , linux-usb@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH] usb: typec: mux: Store module handle Date: Thu, 28 Mar 2019 14:52:08 +0300 Message-Id: <20190328115208.42086-1-heikki.krogerus@linux.intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org It is possible that the driver of the mux device has been unbind by the time typec_mux_put() or typec_switch_put() is called. To prevent the NULL Pointer Dereference from happening in this case when decrementing the reference count of the module by using dev->driver->owner, storing the module handle to the mux and switch data structures, and using the stored value instead. Fixes: ("3e3b81965cbf usb: typec: mux: Take care of driver module reference counting") Cc: stable@vger.kernel.org Signed-off-by: Heikki Krogerus --- drivers/usb/typec/mux.c | 10 ++++++---- include/linux/usb/typec_mux.h | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c index 2ce54f3fc79c..617687c4eb20 100644 --- a/drivers/usb/typec/mux.c +++ b/drivers/usb/typec/mux.c @@ -63,7 +63,8 @@ struct typec_switch *typec_switch_get(struct device *dev) sw = device_connection_find_match(dev, "orientation-switch", NULL, typec_switch_match); if (!IS_ERR_OR_NULL(sw)) { - WARN_ON(!try_module_get(sw->dev->driver->owner)); + sw->module = sw->dev->driver->owner; + WARN_ON(!try_module_get(sw->module)); get_device(sw->dev); } mutex_unlock(&switch_lock); @@ -81,7 +82,7 @@ EXPORT_SYMBOL_GPL(typec_switch_get); void typec_switch_put(struct typec_switch *sw) { if (!IS_ERR_OR_NULL(sw)) { - module_put(sw->dev->driver->owner); + module_put(sw->module); put_device(sw->dev); } } @@ -206,7 +207,8 @@ struct typec_mux *typec_mux_get(struct device *dev, mux = device_connection_find_match(dev, "mode-switch", (void *)desc, typec_mux_match); if (!IS_ERR_OR_NULL(mux)) { - WARN_ON(!try_module_get(mux->dev->driver->owner)); + mux->module = mux->dev->driver->owner; + WARN_ON(!try_module_get(mux->module)); get_device(mux->dev); } mutex_unlock(&mux_lock); @@ -224,7 +226,7 @@ EXPORT_SYMBOL_GPL(typec_mux_get); void typec_mux_put(struct typec_mux *mux) { if (!IS_ERR_OR_NULL(mux)) { - module_put(mux->dev->driver->owner); + module_put(mux->module); put_device(mux->dev); } } diff --git a/include/linux/usb/typec_mux.h b/include/linux/usb/typec_mux.h index 43f40685e53c..b31498020bf3 100644 --- a/include/linux/usb/typec_mux.h +++ b/include/linux/usb/typec_mux.h @@ -20,6 +20,7 @@ struct device; */ struct typec_switch { struct device *dev; + struct module *module; struct list_head entry; int (*set)(struct typec_switch *sw, enum typec_orientation orientation); @@ -37,6 +38,7 @@ struct typec_switch { */ struct typec_mux { struct device *dev; + struct module *module; struct list_head entry; int (*set)(struct typec_mux *mux, int state); -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: usb: typec: mux: Store module handle From: Heikki Krogerus Message-Id: <20190328115208.42086-1-heikki.krogerus@linux.intel.com> Date: Thu, 28 Mar 2019 14:52:08 +0300 To: Greg KH Cc: Hans de Goede , linux-usb@vger.kernel.org, stable@vger.kernel.org List-ID: SXQgaXMgcG9zc2libGUgdGhhdCB0aGUgZHJpdmVyIG9mIHRoZSBtdXggZGV2aWNlIGhhcyBiZWVu CnVuYmluZCBieSB0aGUgdGltZSB0eXBlY19tdXhfcHV0KCkgb3IgdHlwZWNfc3dpdGNoX3B1dCgp IGlzCmNhbGxlZC4KClRvIHByZXZlbnQgdGhlIE5VTEwgUG9pbnRlciBEZXJlZmVyZW5jZSBmcm9t IGhhcHBlbmluZyBpbgp0aGlzIGNhc2Ugd2hlbiBkZWNyZW1lbnRpbmcgdGhlIHJlZmVyZW5jZSBj b3VudCBvZiB0aGUKbW9kdWxlIGJ5IHVzaW5nIGRldi0+ZHJpdmVyLT5vd25lciwgc3RvcmluZyB0 aGUgbW9kdWxlCmhhbmRsZSB0byB0aGUgbXV4IGFuZCBzd2l0Y2ggZGF0YSBzdHJ1Y3R1cmVzLCBh bmQgdXNpbmcgdGhlCnN0b3JlZCB2YWx1ZSBpbnN0ZWFkLgoKRml4ZXM6ICgiM2UzYjgxOTY1Y2Jm IHVzYjogdHlwZWM6IG11eDogVGFrZSBjYXJlIG9mIGRyaXZlciBtb2R1bGUgcmVmZXJlbmNlIGNv dW50aW5nIikKQ2M6IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcKU2lnbmVkLW9mZi1ieTogSGVpa2tp IEtyb2dlcnVzIDxoZWlra2kua3JvZ2VydXNAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMv dXNiL3R5cGVjL211eC5jICAgICAgIHwgMTAgKysrKysrLS0tLQogaW5jbHVkZS9saW51eC91c2Iv dHlwZWNfbXV4LmggfCAgMiArKwogMiBmaWxlcyBjaGFuZ2VkLCA4IGluc2VydGlvbnMoKyksIDQg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvdHlwZWMvbXV4LmMgYi9kcml2 ZXJzL3VzYi90eXBlYy9tdXguYwppbmRleCAyY2U1NGYzZmM3OWMuLjYxNzY4N2M0ZWIyMCAxMDA2 NDQKLS0tIGEvZHJpdmVycy91c2IvdHlwZWMvbXV4LmMKKysrIGIvZHJpdmVycy91c2IvdHlwZWMv bXV4LmMKQEAgLTYzLDcgKzYzLDggQEAgc3RydWN0IHR5cGVjX3N3aXRjaCAqdHlwZWNfc3dpdGNo X2dldChzdHJ1Y3QgZGV2aWNlICpkZXYpCiAJc3cgPSBkZXZpY2VfY29ubmVjdGlvbl9maW5kX21h dGNoKGRldiwgIm9yaWVudGF0aW9uLXN3aXRjaCIsIE5VTEwsCiAJCQkJCSAgdHlwZWNfc3dpdGNo X21hdGNoKTsKIAlpZiAoIUlTX0VSUl9PUl9OVUxMKHN3KSkgewotCQlXQVJOX09OKCF0cnlfbW9k dWxlX2dldChzdy0+ZGV2LT5kcml2ZXItPm93bmVyKSk7CisJCXN3LT5tb2R1bGUgPSBzdy0+ZGV2 LT5kcml2ZXItPm93bmVyOworCQlXQVJOX09OKCF0cnlfbW9kdWxlX2dldChzdy0+bW9kdWxlKSk7 CiAJCWdldF9kZXZpY2Uoc3ctPmRldik7CiAJfQogCW11dGV4X3VubG9jaygmc3dpdGNoX2xvY2sp OwpAQCAtODEsNyArODIsNyBAQCBFWFBPUlRfU1lNQk9MX0dQTCh0eXBlY19zd2l0Y2hfZ2V0KTsK IHZvaWQgdHlwZWNfc3dpdGNoX3B1dChzdHJ1Y3QgdHlwZWNfc3dpdGNoICpzdykKIHsKIAlpZiAo IUlTX0VSUl9PUl9OVUxMKHN3KSkgewotCQltb2R1bGVfcHV0KHN3LT5kZXYtPmRyaXZlci0+b3du ZXIpOworCQltb2R1bGVfcHV0KHN3LT5tb2R1bGUpOwogCQlwdXRfZGV2aWNlKHN3LT5kZXYpOwog CX0KIH0KQEAgLTIwNiw3ICsyMDcsOCBAQCBzdHJ1Y3QgdHlwZWNfbXV4ICp0eXBlY19tdXhfZ2V0 KHN0cnVjdCBkZXZpY2UgKmRldiwKIAltdXggPSBkZXZpY2VfY29ubmVjdGlvbl9maW5kX21hdGNo KGRldiwgIm1vZGUtc3dpdGNoIiwgKHZvaWQgKilkZXNjLAogCQkJCQkgICB0eXBlY19tdXhfbWF0 Y2gpOwogCWlmICghSVNfRVJSX09SX05VTEwobXV4KSkgewotCQlXQVJOX09OKCF0cnlfbW9kdWxl X2dldChtdXgtPmRldi0+ZHJpdmVyLT5vd25lcikpOworCQltdXgtPm1vZHVsZSA9IG11eC0+ZGV2 LT5kcml2ZXItPm93bmVyOworCQlXQVJOX09OKCF0cnlfbW9kdWxlX2dldChtdXgtPm1vZHVsZSkp OwogCQlnZXRfZGV2aWNlKG11eC0+ZGV2KTsKIAl9CiAJbXV0ZXhfdW5sb2NrKCZtdXhfbG9jayk7 CkBAIC0yMjQsNyArMjI2LDcgQEAgRVhQT1JUX1NZTUJPTF9HUEwodHlwZWNfbXV4X2dldCk7CiB2 b2lkIHR5cGVjX211eF9wdXQoc3RydWN0IHR5cGVjX211eCAqbXV4KQogewogCWlmICghSVNfRVJS X09SX05VTEwobXV4KSkgewotCQltb2R1bGVfcHV0KG11eC0+ZGV2LT5kcml2ZXItPm93bmVyKTsK KwkJbW9kdWxlX3B1dChtdXgtPm1vZHVsZSk7CiAJCXB1dF9kZXZpY2UobXV4LT5kZXYpOwogCX0K IH0KZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGludXgvdXNiL3R5cGVjX211eC5oIGIvaW5jbHVkZS9s aW51eC91c2IvdHlwZWNfbXV4LmgKaW5kZXggNDNmNDA2ODVlNTNjLi5iMzE0OTgwMjBiZjMgMTAw NjQ0Ci0tLSBhL2luY2x1ZGUvbGludXgvdXNiL3R5cGVjX211eC5oCisrKyBiL2luY2x1ZGUvbGlu dXgvdXNiL3R5cGVjX211eC5oCkBAIC0yMCw2ICsyMCw3IEBAIHN0cnVjdCBkZXZpY2U7CiAgKi8K IHN0cnVjdCB0eXBlY19zd2l0Y2ggewogCXN0cnVjdCBkZXZpY2UgKmRldjsKKwlzdHJ1Y3QgbW9k dWxlICptb2R1bGU7CiAJc3RydWN0IGxpc3RfaGVhZCBlbnRyeTsKIAogCWludCAoKnNldCkoc3Ry dWN0IHR5cGVjX3N3aXRjaCAqc3csIGVudW0gdHlwZWNfb3JpZW50YXRpb24gb3JpZW50YXRpb24p OwpAQCAtMzcsNiArMzgsNyBAQCBzdHJ1Y3QgdHlwZWNfc3dpdGNoIHsKICAqLwogc3RydWN0IHR5 cGVjX211eCB7CiAJc3RydWN0IGRldmljZSAqZGV2OworCXN0cnVjdCBtb2R1bGUgKm1vZHVsZTsK IAlzdHJ1Y3QgbGlzdF9oZWFkIGVudHJ5OwogCiAJaW50ICgqc2V0KShzdHJ1Y3QgdHlwZWNfbXV4 ICptdXgsIGludCBzdGF0ZSk7Cg==