Merge tag 'regmap-fix-v6.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

torvalds · torvalds · commit e1e80380f1c2 · 2023-10-18T09:30:03.000-07:00
Pull regmap fix from Mark Brown:
 "A straightforward fix from Johan for a long standing bug in cases
  where we both have regmaps without devices and something is using
  dev_get_regmap()"

* tag 'regmap-fix-v6.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: fix NULL deref on lookup
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
@@ -1478,7 +1478,7 @@ static int dev_get_regmap_match(struct device *dev, void *res, void *data)
 
 	/* If the user didn't specify a name match any */
 	if (data)
-		return !strcmp((*r)->name, data);
+		return (*r)->name && !strcmp((*r)->name, data);
 	else
 		return 1;
 }

Original file line number	Diff line number	Diff line change
`@@ -1478,7 +1478,7 @@ static int dev_get_regmap_match(struct device dev, void res, void *data)`
`1478`	`1478`
`1479`	`1479`	`/* If the user didn't specify a name match any */`
`1480`	`1480`	`if (data)`
`1481`		`- return !strcmp((*r)->name, data);`
	`1481`	`+ return (r)->name && !strcmp((r)->name, data);`
`1482`	`1482`	`else`
`1483`	`1483`	`return 1;`
`1484`	`1484`	`}`