Merge branches 'pm-devfreq' and 'pm-cpufreq'

* pm-devfreq:
  PM / devfreq: fix double kfree
  PM / devfreq: Fix governor_store()

* pm-cpufreq:
  cpufreq: prevent lockup on reading scaling_available_frequencies
  cpufreq: acpi_cpufreq: prevent crash on reading freqdomain_cpus

1 files changed, 4 insertions, 4 deletions

diff --git a/ipc/util.c b/ipc/util.c
index be4230020a1f..0f401d94b7c6 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -237,6 +237,10 @@ int ipc_addid(struct ipc_ids *ids, struct kern_ipc_perm *new, int size)
         rcu_read_lock();
         spin_lock(&new->lock);
 
+        current_euid_egid(&euid, &egid);
+        new->cuid = new->uid = euid;
+        new->gid = new->cgid = egid;
+
         id = idr_alloc(&ids->ipcs_idr, new,
                        (next_id < 0) ? 0 : ipcid_to_idx(next_id), 0,
                        GFP_NOWAIT);
@@ -249,10 +253,6 @@ int ipc_addid(struct ipc_ids *ids, struct kern_ipc_perm *new, int size)
 
         ids->in_use++;
 
-        current_euid_egid(&euid, &egid);
-        new->cuid = new->uid = euid;
-        new->gid = new->cgid = egid;
-
         if (next_id < 0) {
                 new->seq = ids->seq++;
                 if (ids->seq > IPCID_SEQ_MAX)