diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-31 10:50:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-31 10:50:05 -0800 |
| commit | 4288e6b4dd60d2f80213de32eb7a71c4d63c0b77 (patch) | |
| tree | c7ee95b6aaa4bf354594024ccb4dd70c1bf2a778 /lib | |
| parent | 29a9b0008d5ddbea8a6dcfd5aecc866585f6048e (diff) | |
| parent | 9b3fa47d4a76b1d606a396455f9bbeee083ef008 (diff) | |
| download | linux-stable-4288e6b4dd60d2f80213de32eb7a71c4d63c0b77.tar.gz linux-stable-4288e6b4dd60d2f80213de32eb7a71c4d63c0b77.tar.bz2 linux-stable-4288e6b4dd60d2f80213de32eb7a71c4d63c0b77.zip | |
Merge tag 'driver-core-4.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fixes from Greg KH:
"Here are two driver core fixes for 4.15-rc6, resolving some reported
issues.
The first is a cacheinfo fix for DT based systems to resolve a
reported issue that has been around for a while, and the other is to
resolve a regression in the kobject uevent code that showed up in
4.15-rc1.
Both have been in linux-next for a while with no reported issues"
* tag 'driver-core-4.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
kobject: fix suppressing modalias in uevents delivered over netlink
drivers: base: cacheinfo: fix cache type for non-architected system cache
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kobject_uevent.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c index c3e84edc47c9..2615074d3de5 100644 --- a/lib/kobject_uevent.c +++ b/lib/kobject_uevent.c @@ -346,7 +346,8 @@ static int kobject_uevent_net_broadcast(struct kobject *kobj, static void zap_modalias_env(struct kobj_uevent_env *env) { static const char modalias_prefix[] = "MODALIAS="; - int i; + size_t len; + int i, j; for (i = 0; i < env->envp_idx;) { if (strncmp(env->envp[i], modalias_prefix, @@ -355,11 +356,18 @@ static void zap_modalias_env(struct kobj_uevent_env *env) continue; } - if (i != env->envp_idx - 1) - memmove(&env->envp[i], &env->envp[i + 1], - sizeof(env->envp[i]) * env->envp_idx - 1); + len = strlen(env->envp[i]) + 1; + + if (i != env->envp_idx - 1) { + memmove(env->envp[i], env->envp[i + 1], + env->buflen - len); + + for (j = i; j < env->envp_idx - 1; j++) + env->envp[j] = env->envp[j + 1] - len; + } env->envp_idx--; + env->buflen -= len; } } |