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=-17.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_SANE_2 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 74B40C432BE for ; Wed, 1 Sep 2021 18:06:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 53C2860E98 for ; Wed, 1 Sep 2021 18:06:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346703AbhIASHw (ORCPT ); Wed, 1 Sep 2021 14:07:52 -0400 Received: from mailgw01.mediatek.com ([60.244.123.138]:57902 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1346734AbhIASHv (ORCPT ); Wed, 1 Sep 2021 14:07:51 -0400 X-UUID: 62de42abce6d4f228f00c53115857dc6-20210902 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=JGJFdApMcubNDWvC7wCYe/neX6g9lSnZlMWbSWb6VQQ=; b=Ur35WI6b93Vt0goLnNy7P0aVSgLl0QfsFqUtu7BacGCPDxLtH7Y59rbFUpO89t7mbny9cnSvQHTruxnUQiFFASq2huV8s72n8JQPcu4/UTUKWPnVQho14Sg9wYo+85NcuroaXsgq+aF9b6aNFY42ygXXAmxELBWgLk6x+r/TEfg=; X-UUID: 62de42abce6d4f228f00c53115857dc6-20210902 Received: from mtkmbs10n1.mediatek.inc [(172.21.101.34)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 2042623059; Thu, 02 Sep 2021 02:06:50 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs05n2.mediatek.inc (172.21.101.140) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 2 Sep 2021 02:06:49 +0800 Received: from mtksdccf07 (172.21.84.99) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 2 Sep 2021 02:06:49 +0800 Message-ID: <32b9ac1244f38d20f89548b14aa8d2afb0fa779b.camel@mediatek.com> Subject: Re: [PATCH v5 1/2] mt76: mt7915: fix hwmon temp sensor mem use-after-free From: Ryder Lee To: Ben Greear , Felix Fietkau CC: Lorenzo Bianconi , Shayne Chen , Evelyn Tsai , , Date: Thu, 2 Sep 2021 02:06:49 +0800 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.2 MIME-Version: 1.0 X-MTK: N Content-Transfer-Encoding: base64 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org T24gV2VkLCAyMDIxLTA5LTAxIGF0IDEwOjU1IC0wNzAwLCBCZW4gR3JlZWFyIHdyb3RlOg0KPiBP biA5LzEvMjEgMTA6NDkgQU0sIFJ5ZGVyIExlZSB3cm90ZToNCj4gPiBGcm9tOiBCZW4gR3JlZWFy IDxncmVlYXJiQGNhbmRlbGF0ZWNoLmNvbT4NCj4gPiANCj4gPiBXaXRob3V0IHRoaXMgY2hhbmdl LCBnYXJiYWdlIGlzIHNlZW4gaW4gdGhlIGh3bW9uIG5hbWUgYW5kIHNlbnNvcnMNCj4gPiBvdXRw dXQNCj4gPiBmb3IgbXQ3OTE1IGlzIGdhcmJsZWQuIEl0IGFwcGVhcnMgdGhhdCB0aGUgaHdtb24g bG9naWMgZG9lcyBub3QNCj4gPiBtYWtlIGENCj4gPiBjb3B5IG9mIHRoZSBpbmNvbWluZyBzdHJp bmcsIGJ1dCBpbnN0ZWFkIGp1c3QgY29waWVzIGEgY2hhciogYW5kDQo+ID4gZXhwZWN0cw0KPiA+ IGl0IHRvIG5ldmVyIGdvIGF3YXkuDQo+ID4gDQo+ID4gRml4ZXM6IGQ2OTM4MjUxYmI1YiAoIm10 NzY6IG10NzkxNTogYWRkIHRoZXJtYWwgc2Vuc29yIGRldmljZQ0KPiA+IHN1cHBvcnQiKQ0KPiA+ IFNpZ25lZC1vZmYtYnk6IEJlbiBHcmVlYXIgPGdyZWVhcmJAY2FuZGVsYXRlY2guY29tPg0KPiA+ IFNpZ25lZC1vZmYtYnk6IFJ5ZGVyIExlZSA8cnlkZXIubGVlQG1lZGlhdGVrLmNvbT4NCj4gPiAt LS0NCj4gPiB2NTogIFVzZSBkZXZtX2tzdHJkdXAgb24gdGhlIHdpcGh5IG5hbWUgYXMgc3VnZ2Vz dGVkLg0KPiANCj4gSSBkb24ndCBjYXJlIGEgZ3JlYXQgZGVhbCBlaXRoZXIgd2F5LCBidXQgcGh5 bmFtZSBjYW4gY2hhbmdlICh3aGljaA0KPiB3YXMgb3JpZ2luYWwNCj4gd2F5IHRvIHJlcHJvZHVj ZSB0aGlzIGNvcnJ1cHRpb24gYnVnKSwgc28gd2l0aCB0aGlzIHY1IGNoYW5nZSwgdGhlbg0KPiB0 aGUgaHdtb24gJ2lkJyBjb3VsZCBjb25mdXNpbmdseQ0KPiBiZSAncGh5MCcgd2hpbGUgdXNlciBo YXMgcmVuYW1lZCB0aGUgcGh5MCB0byB3aXBoeTAgb3Igd2hhdGV2ZXIuDQo+IA0KPiBJdCB3b24n dCBicmVhayBteSB1c2FnZSBlaXRoZXIgd2F5LCBzbyBpZiB5b3UgYXJlIGhhcHB5IHdpdGggdGhp cywNCj4gdGhlbiBnb29kDQo+IGVub3VnaCBmb3IgbWUuDQoNCkkgdGhvdWdodCBvZiB0aGlzIC4u LiBDb25zaWRlcmluZyB0aGUgaHdtb24gY2FuJ3QgbmV2ZXIga25vdyB0aGUNCnBoeW5hbWUgb25j ZSBpdCBnb3QgY2hhbmdlZC4gV2UgY2FuIG9ubHkgc3BlY2lmaXkgYSBzdGF0aWMgIm10NzkxNS14 eHgiIA0KdG8gbmFtZSBpdCwgb3IganVzdCB1c2UgYW4gaW5pdGlhbCBwaHluYW1lLiBBbnlob3cg aXQncyBub3QgdGhlIHJlYWwNCnBoeW5hbWUgeW91IGNoYW5nZSBhY3R1YWxseS4NCg0KPiBCdXQs IHNlZSBiZWxvdywgdGhlcmUgaXMgc3B1cmlvdXMgY2hhbmdlLi4uDQo+IA0KPiANCj4gPiB2NDog IFNpbXBsaWZ5IGZsb3cuDQo+ID4gdjM6ICBBZGQgJ2ZpeGVzJyB0YWcgdG8gYWlkIGJhY2twb3J0 cy4NCj4gPiAtLS0NCj4gPiAgIGRyaXZlcnMvbmV0L3dpcmVsZXNzL21lZGlhdGVrL210NzYvbXQ3 OTE1L2luaXQuYyB8IDggKysrKy0tLS0NCj4gPiAgIGRyaXZlcnMvbmV0L3dpcmVsZXNzL21lZGlh dGVrL210NzYvbXQ3OTE1L21jdS5jICB8IDIgKy0NCj4gPiAgIDIgZmlsZXMgY2hhbmdlZCwgNSBp bnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQ0KPiA+IA0KPiA+IGRpZmYgLS1naXQgYS9kcml2 ZXJzL25ldC93aXJlbGVzcy9tZWRpYXRlay9tdDc2L210NzkxNS9pbml0LmMNCj4gPiBiL2RyaXZl cnMvbmV0L3dpcmVsZXNzL21lZGlhdGVrL210NzYvbXQ3OTE1L2luaXQuYw0KPiA+IGluZGV4IGFj YzgzZTlmNDA5Yi4uNzhiOWFiYmU2M2YzIDEwMDY0NA0KPiA+IC0tLSBhL2RyaXZlcnMvbmV0L3dp cmVsZXNzL21lZGlhdGVrL210NzYvbXQ3OTE1L2luaXQuYw0KPiA+ICsrKyBiL2RyaXZlcnMvbmV0 L3dpcmVsZXNzL21lZGlhdGVrL210NzYvbXQ3OTE1L2luaXQuYw0KPiA+IEBAIC0xNjAsOSArMTYw LDEwIEBAIHN0YXRpYyBpbnQgbXQ3OTE1X3RoZXJtYWxfaW5pdChzdHJ1Y3QNCj4gPiBtdDc5MTVf cGh5ICpwaHkpDQo+ID4gICAJc3RydWN0IHdpcGh5ICp3aXBoeSA9IHBoeS0+bXQ3Ni0+aHctPndp cGh5Ow0KPiA+ICAgCXN0cnVjdCB0aGVybWFsX2Nvb2xpbmdfZGV2aWNlICpjZGV2Ow0KPiA+ICAg CXN0cnVjdCBkZXZpY2UgKmh3bW9uOw0KPiA+ICsJY29uc3QgY2hhciAqbmFtZTsNCj4gPiAgIA0K PiA+IC0JY2RldiA9IHRoZXJtYWxfY29vbGluZ19kZXZpY2VfcmVnaXN0ZXIod2lwaHlfbmFtZSh3 aXBoeSksIHBoeSwNCj4gPiAtCQkJCQkgICAgICAgJm10NzkxNV90aGVybWFsX29wcyk7DQo+ID4g KwluYW1lID0gZGV2bV9rc3RyZHVwKCZ3aXBoeS0+ZGV2LCB3aXBoeV9uYW1lKHdpcGh5KSwNCj4g PiBHRlBfS0VSTkVMKTsNCj4gPiArCWNkZXYgPSB0aGVybWFsX2Nvb2xpbmdfZGV2aWNlX3JlZ2lz dGVyKG5hbWUsIHBoeSwNCj4gPiAmbXQ3OTE1X3RoZXJtYWxfb3BzKTsNCj4gPiAgIAlpZiAoIUlT X0VSUihjZGV2KSkgew0KPiA+ICAgCQlpZiAoc3lzZnNfY3JlYXRlX2xpbmsoJndpcGh5LT5kZXYu a29iaiwgJmNkZXYtDQo+ID4gPmRldmljZS5rb2JqLA0KPiA+ICAgCQkJCSAgICAgICJjb29saW5n X2RldmljZSIpIDwgMCkNCj4gPiBAQCAtMTc0LDggKzE3NSw3IEBAIHN0YXRpYyBpbnQgbXQ3OTE1 X3RoZXJtYWxfaW5pdChzdHJ1Y3QNCj4gPiBtdDc5MTVfcGh5ICpwaHkpDQo+ID4gICAJaWYgKCFJ U19SRUFDSEFCTEUoQ09ORklHX0hXTU9OKSkNCj4gPiAgIAkJcmV0dXJuIDA7DQo+ID4gICANCj4g PiAtCWh3bW9uID0gZGV2bV9od21vbl9kZXZpY2VfcmVnaXN0ZXJfd2l0aF9ncm91cHMoJndpcGh5 LT5kZXYsDQo+ID4gLQkJCQkJCSAgICAgICB3aXBoeV9uYW1lKHdpcGh5DQo+ID4gKSwgcGh5LA0K PiA+ICsJaHdtb24gPSBkZXZtX2h3bW9uX2RldmljZV9yZWdpc3Rlcl93aXRoX2dyb3Vwcygmd2lw aHktPmRldiwNCj4gPiBuYW1lLCBwaHksDQo+ID4gICAJCQkJCQkgICAgICAgbXQ3OTE1X2h3bW9u X2dybw0KPiA+IHVwcyk7DQo+ID4gICAJaWYgKElTX0VSUihod21vbikpDQo+ID4gICAJCXJldHVy biBQVFJfRVJSKGh3bW9uKTsNCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9uZXQvd2lyZWxlc3Mv bWVkaWF0ZWsvbXQ3Ni9tdDc5MTUvbWN1LmMNCj4gPiBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL21l ZGlhdGVrL210NzYvbXQ3OTE1L21jdS5jDQo+ID4gaW5kZXggOTMyY2Y1YTYyOWRiLi4yMTliYjM1 M2I1NmQgMTAwNjQ0DQo+ID4gLS0tIGEvZHJpdmVycy9uZXQvd2lyZWxlc3MvbWVkaWF0ZWsvbXQ3 Ni9tdDc5MTUvbWN1LmMNCj4gPiArKysgYi9kcml2ZXJzL25ldC93aXJlbGVzcy9tZWRpYXRlay9t dDc2L210NzkxNS9tY3UuYw0KPiA+IEBAIC0xOTYyLDcgKzE5NjIsNyBAQCBtdDc5MTVfbWN1X3N0 YV9iZmVyX3RsdihzdHJ1Y3QgbXQ3OTE1X2Rldg0KPiA+ICpkZXYsIHN0cnVjdCBza19idWZmICpz a2IsDQo+ID4gICAJZWxzZQ0KPiA+ICAgCQlyZXR1cm47DQo+ID4gICANCj4gPiAtCWJmLT5iZl9j YXAgPSBCSVQoIWViZiAmJiBkZXYtPmliZik7DQo+ID4gKwliZi0+YmZfY2FwID0gZWJmID8gZWJm IDogZGV2LT5pYmYgPDwgMTsNCj4gDQo+IEFuZCB0aGlzIHNob3VsZCBub3QgYmUgaW4gdGhpcyBw YXRjaC4NCj4gDQoNCk9vcHMuIEkgbWVzc2VkIHBhdGNoIHVwIHdoaWxlIG1lcmdpbmcgdG8gb3Ro ZXIgc2VyaWVzLiBXaWxsIGZpeC4NCg0KUnlkZXINCj4gDQo= 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=-15.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_SANE_2 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 80180C432BE for ; Wed, 1 Sep 2021 18:07:18 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 41590610C8 for ; Wed, 1 Sep 2021 18:07:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 41590610C8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:CC:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ReoB8NyBIgR9Fyv0o+IajNUAi8PEjG4w6QSvgFZCbO4=; b=0Ly0E1koM29Sfz WP+uS33b3VgUM3usOEiTMHxkRPCZs5SJ51YqVcVf8vWD6lEcQZO3j4ZDQ89TRmWDvrt1iN0Xu8Beh OJohWrV7MT1gPEjoj7sp9QEowfLufe9wiwQYRnEGGfkc4fL+vM27LRA3YXf8LNydAsnKLYJ3Y/Daf +EGbHOPKPss9LOK/5Ekfby2sKar1bpc1Go32+Pf8mPF7AYtg8kB4bZyFm65vTbyd1QMIjNgliIb4W 5I1xSaQPhAqfJ55SdZF1/CIKnnmIuOweOF711oVOSwwZsJVsfF0sWmRUi6OvevQFnzrlzdBKgb9xz JV/+tpkVo8z3q/GclA3g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mLUde-006vGo-16; Wed, 01 Sep 2021 18:07:06 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mLUdY-006vG4-NJ for linux-mediatek@lists.infradead.org; Wed, 01 Sep 2021 18:07:04 +0000 X-UUID: 9957b91662a544cdb1841ed198b68e18-20210901 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=JGJFdApMcubNDWvC7wCYe/neX6g9lSnZlMWbSWb6VQQ=; b=Ur35WI6b93Vt0goLnNy7P0aVSgLl0QfsFqUtu7BacGCPDxLtH7Y59rbFUpO89t7mbny9cnSvQHTruxnUQiFFASq2huV8s72n8JQPcu4/UTUKWPnVQho14Sg9wYo+85NcuroaXsgq+aF9b6aNFY42ygXXAmxELBWgLk6x+r/TEfg=; X-UUID: 9957b91662a544cdb1841ed198b68e18-20210901 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1130805644; Wed, 01 Sep 2021 11:06:58 -0700 Received: from mtkmbs05n2.mediatek.inc (172.21.101.140) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 1 Sep 2021 11:06:57 -0700 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs05n2.mediatek.inc (172.21.101.140) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 2 Sep 2021 02:06:49 +0800 Received: from mtksdccf07 (172.21.84.99) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 2 Sep 2021 02:06:49 +0800 Message-ID: <32b9ac1244f38d20f89548b14aa8d2afb0fa779b.camel@mediatek.com> Subject: Re: [PATCH v5 1/2] mt76: mt7915: fix hwmon temp sensor mem use-after-free From: Ryder Lee To: Ben Greear , Felix Fietkau CC: Lorenzo Bianconi , Shayne Chen , Evelyn Tsai , , Date: Thu, 2 Sep 2021 02:06:49 +0800 In-Reply-To: References: X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.2 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210901_110700_813047_1981FE3A X-CRM114-Status: GOOD ( 27.58 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org On Wed, 2021-09-01 at 10:55 -0700, Ben Greear wrote: > On 9/1/21 10:49 AM, Ryder Lee wrote: > > From: Ben Greear > > > > Without this change, garbage is seen in the hwmon name and sensors > > output > > for mt7915 is garbled. It appears that the hwmon logic does not > > make a > > copy of the incoming string, but instead just copies a char* and > > expects > > it to never go away. > > > > Fixes: d6938251bb5b ("mt76: mt7915: add thermal sensor device > > support") > > Signed-off-by: Ben Greear > > Signed-off-by: Ryder Lee > > --- > > v5: Use devm_kstrdup on the wiphy name as suggested. > > I don't care a great deal either way, but phyname can change (which > was original > way to reproduce this corruption bug), so with this v5 change, then > the hwmon 'id' could confusingly > be 'phy0' while user has renamed the phy0 to wiphy0 or whatever. > > It won't break my usage either way, so if you are happy with this, > then good > enough for me. I thought of this ... Considering the hwmon can't never know the phyname once it got changed. We can only specifiy a static "mt7915-xxx" to name it, or just use an initial phyname. Anyhow it's not the real phyname you change actually. > But, see below, there is spurious change... > > > > v4: Simplify flow. > > v3: Add 'fixes' tag to aid backports. > > --- > > drivers/net/wireless/mediatek/mt76/mt7915/init.c | 8 ++++---- > > drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 2 +- > > 2 files changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c > > b/drivers/net/wireless/mediatek/mt76/mt7915/init.c > > index acc83e9f409b..78b9abbe63f3 100644 > > --- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c > > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c > > @@ -160,9 +160,10 @@ static int mt7915_thermal_init(struct > > mt7915_phy *phy) > > struct wiphy *wiphy = phy->mt76->hw->wiphy; > > struct thermal_cooling_device *cdev; > > struct device *hwmon; > > + const char *name; > > > > - cdev = thermal_cooling_device_register(wiphy_name(wiphy), phy, > > - &mt7915_thermal_ops); > > + name = devm_kstrdup(&wiphy->dev, wiphy_name(wiphy), > > GFP_KERNEL); > > + cdev = thermal_cooling_device_register(name, phy, > > &mt7915_thermal_ops); > > if (!IS_ERR(cdev)) { > > if (sysfs_create_link(&wiphy->dev.kobj, &cdev- > > >device.kobj, > > "cooling_device") < 0) > > @@ -174,8 +175,7 @@ static int mt7915_thermal_init(struct > > mt7915_phy *phy) > > if (!IS_REACHABLE(CONFIG_HWMON)) > > return 0; > > > > - hwmon = devm_hwmon_device_register_with_groups(&wiphy->dev, > > - wiphy_name(wiphy > > ), phy, > > + hwmon = devm_hwmon_device_register_with_groups(&wiphy->dev, > > name, phy, > > mt7915_hwmon_gro > > ups); > > if (IS_ERR(hwmon)) > > return PTR_ERR(hwmon); > > diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c > > b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c > > index 932cf5a629db..219bb353b56d 100644 > > --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c > > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c > > @@ -1962,7 +1962,7 @@ mt7915_mcu_sta_bfer_tlv(struct mt7915_dev > > *dev, struct sk_buff *skb, > > else > > return; > > > > - bf->bf_cap = BIT(!ebf && dev->ibf); > > + bf->bf_cap = ebf ? ebf : dev->ibf << 1; > > And this should not be in this patch. > Oops. I messed patch up while merging to other series. Will fix. Ryder > _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek