diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-01-30 22:22:34 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-01-30 22:22:33 -0800 |
| commit | b2aa44c5d5b892798307a92aaacb3c50fa581842 (patch) | |
| tree | 6177d61748734ff2bb477eb9487e9d210913154f /kernel | |
| parent | 1bc2a5fa8337018731393b8d6b2f83203ff0f5d3 (diff) | |
| parent | cf61d4f2ea8417b5686926524842159e9f24ebd0 (diff) | |
Merge "Merge android-4.4.171 (b355d4f) into msm-4.4"
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/fork.c | 13 | ||||
| -rw-r--r-- | kernel/memremap.c | 11 |
2 files changed, 15 insertions, 9 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 77a21c3d02e3..25d0a60d166c 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1446,8 +1446,6 @@ static struct task_struct *copy_process(unsigned long clone_flags, posix_cpu_timers_init(p); - p->start_time = ktime_get_ns(); - p->real_start_time = ktime_get_boot_ns(); p->io_context = NULL; p->audit_context = NULL; cgroup_fork(p); @@ -1608,6 +1606,17 @@ static struct task_struct *copy_process(unsigned long clone_flags, goto bad_fork_free_pid; /* + * From this point on we must avoid any synchronous user-space + * communication until we take the tasklist-lock. In particular, we do + * not want user-space to be able to predict the process start-time by + * stalling fork(2) after we recorded the start_time but before it is + * visible to the system. + */ + + p->start_time = ktime_get_ns(); + p->real_start_time = ktime_get_boot_ns(); + + /* * Make it visible to the rest of the system, but dont wake it up yet. * Need tasklist lock for parent etc handling! */ diff --git a/kernel/memremap.c b/kernel/memremap.c index f719c925cb54..1be42f9b3e00 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -171,15 +171,12 @@ void *devm_memremap_pages(struct device *dev, struct resource *res) struct page_map *page_map; int error, nid; - if (is_ram == REGION_MIXED) { - WARN_ONCE(1, "%s attempted on mixed region %pr\n", - __func__, res); + if (is_ram != REGION_DISJOINT) { + WARN_ONCE(1, "%s attempted on %s region %pr\n", __func__, + is_ram == REGION_MIXED ? "mixed" : "ram", res); return ERR_PTR(-ENXIO); } - if (is_ram == REGION_INTERSECTS) - return __va(res->start); - page_map = devres_alloc_node(devm_memremap_pages_release, sizeof(*page_map), GFP_KERNEL, dev_to_node(dev)); if (!page_map) @@ -202,5 +199,5 @@ void *devm_memremap_pages(struct device *dev, struct resource *res) devres_add(dev, page_map); return __va(res->start); } -EXPORT_SYMBOL(devm_memremap_pages); +EXPORT_SYMBOL_GPL(devm_memremap_pages); #endif /* CONFIG_ZONE_DEVICE */ |