mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Driver core: change add_uevent_var to use a struct
This changes the uevent buffer functions to use a struct instead of a long list of parameters. It does no longer require the caller to do the proper buffer termination and size accounting, which is currently wrong in some places. It fixes a known bug where parts of the uevent environment are overwritten because of wrong index calculations. Many thanks to Mathieu Desnoyers for finding bugs and improving the error handling. Signed-off-by: Kay Sievers <[email protected]> Cc: Mathieu Desnoyers <[email protected]> Cc: Cornelia Huck <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
parent
8380770c84
commit
7eff2e7a8b
47 changed files with 300 additions and 636 deletions
|
|
@ -58,12 +58,11 @@ static int mmc_bus_match(struct device *dev, struct device_driver *drv)
|
|||
}
|
||||
|
||||
static int
|
||||
mmc_bus_uevent(struct device *dev, char **envp, int num_envp, char *buf,
|
||||
int buf_size)
|
||||
mmc_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
|
||||
{
|
||||
struct mmc_card *card = dev_to_mmc_card(dev);
|
||||
const char *type;
|
||||
int i = 0, length = 0;
|
||||
int retval = 0;
|
||||
|
||||
switch (card->type) {
|
||||
case MMC_TYPE_MMC:
|
||||
|
|
@ -80,20 +79,14 @@ mmc_bus_uevent(struct device *dev, char **envp, int num_envp, char *buf,
|
|||
}
|
||||
|
||||
if (type) {
|
||||
if (add_uevent_var(envp, num_envp, &i,
|
||||
buf, buf_size, &length,
|
||||
"MMC_TYPE=%s", type))
|
||||
return -ENOMEM;
|
||||
retval = add_uevent_var(env, "MMC_TYPE=%s", type);
|
||||
if (retval)
|
||||
return retval;
|
||||
}
|
||||
|
||||
if (add_uevent_var(envp, num_envp, &i,
|
||||
buf, buf_size, &length,
|
||||
"MMC_NAME=%s", mmc_card_name(card)))
|
||||
return -ENOMEM;
|
||||
retval = add_uevent_var(env, "MMC_NAME=%s", mmc_card_name(card));
|
||||
|
||||
envp[i] = NULL;
|
||||
|
||||
return 0;
|
||||
return retval;
|
||||
}
|
||||
|
||||
static int mmc_bus_probe(struct device *dev)
|
||||
|
|
|
|||
Loading…
Reference in a new issue