Commit ebf08935 authored by RD Babiera's avatar RD Babiera Committed by Zhang Changzhong
Browse files

usb: typec: altmodes/displayport: create sysfs nodes as driver's default device attribute group 

mainline inclusion
from mainline-v6.8
commit 165376f6b23e9a779850e750fb2eb06622e5a531
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9Q8ZK
CVE: CVE-2024-35790

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=165376f6b23e9a779850e750fb2eb06622e5a531



--------------------------------

The DisplayPort driver's sysfs nodes may be present to the userspace before
typec_altmode_set_drvdata() completes in dp_altmode_probe. This means that
a sysfs read can trigger a NULL pointer error by deferencing dp->hpd in
hpd_show or dp->lock in pin_assignment_show, as dev_get_drvdata() returns
NULL in those cases.

Remove manual sysfs node creation in favor of adding attribute group as
default for devices bound to the driver. The ATTRIBUTE_GROUPS() macro is
not used here otherwise the path to the sysfs nodes is no longer compliant
with the ABI.

Fixes: 0e3bb7d6 ("usb: typec: Add driver for DisplayPort alternate mode")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarRD Babiera <rdbabiera@google.com>
Link: https://lore.kernel.org/r/20240229001101.3889432-2-rdbabiera@google.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Conflicts:
	drivers/usb/typec/altmodes/displayport.c
[001b0c78 ("usb: typec: altmodes/displayport: Add hpd sysfs attribute") not merged]
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parent 623051c7

drivers/usb/typec/altmodes/displayport.c

+9 −9
Original line number Diff line number Diff line
@@ -512,22 +512,26 @@ static ssize_t pin_assignment_show(struct device *dev, 
}

static DEVICE_ATTR_RW(pin_assignment);



static struct attribute *dp_altmode_attrs[] = {

static struct attribute *displayport_attrs[] = {

	&dev_attr_configuration.attr,

	&dev_attr_pin_assignment.attr,

	NULL

};



static const struct attribute_group dp_altmode_group = {

static const struct attribute_group displayport_group = {

	.name = "displayport",

	.attrs = dp_altmode_attrs,

	.attrs = displayport_attrs,

};



static const struct attribute_group *displayport_groups[] = {

	&displayport_group,

	NULL,

};



int dp_altmode_probe(struct typec_altmode *alt)

{

	const struct typec_altmode *port = typec_altmode_get_partner(alt);

	struct dp_altmode *dp;

	int ret;



	/* FIXME: Port can only be DFP_U. */
@@ -538,10 +542,6 @@ int dp_altmode_probe(struct typec_altmode *alt) 
	      DP_CAP_PIN_ASSIGN_DFP_D(alt->vdo)))

		return -ENODEV;



	ret = sysfs_create_group(&alt->dev.kobj, &dp_altmode_group);

	if (ret)

		return ret;



	dp = devm_kzalloc(&alt->dev, sizeof(*dp), GFP_KERNEL);

	if (!dp)

		return -ENOMEM;
@@ -567,7 +567,6 @@ void dp_altmode_remove(struct typec_altmode *alt) 
{

	struct dp_altmode *dp = typec_altmode_get_drvdata(alt);



	sysfs_remove_group(&alt->dev.kobj, &dp_altmode_group);

	cancel_work_sync(&dp->work);

}

EXPORT_SYMBOL_GPL(dp_altmode_remove);
@@ -585,6 +584,7 @@ static struct typec_altmode_driver dp_altmode_driver = { 
	.driver = {

		.name = "typec_displayport",

		.owner = THIS_MODULE,

		.dev_groups = displayport_groups,

	},

};

module_typec_altmode_driver(dp_altmode_driver);