Revert "cred: switch to using atomic_long_t"
This reverts commit f21b7610d55f7af316a060cff522bf0ea85e6e9b which is
commit f8fa5d76925991976b3e7076f9d1052515ec1fca upstream.
It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way.
Bug: 161946584
Bug: 317347552
Change-Id: I9eb52866bc3b2a9f02e3f7fbee0bacbcc06b0849
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
diff --git a/include/linux/cred.h b/include/linux/cred.h
index 5e0fa7f..fcbc688 100644
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -108,7 +108,7 @@
* same context as task->real_cred.
*/
struct cred {
- atomic_long_t usage;
+ atomic_t usage;
#ifdef CONFIG_DEBUG_CREDENTIALS
atomic_t subscribers; /* number of processes subscribed */
void *put_addr;
@@ -228,7 +228,7 @@
*/
static inline struct cred *get_new_cred(struct cred *cred)
{
- atomic_long_inc(&cred->usage);
+ atomic_inc(&cred->usage);
return cred;
}
@@ -260,7 +260,7 @@
struct cred *nonconst_cred = (struct cred *) cred;
if (!cred)
return NULL;
- if (!atomic_long_inc_not_zero(&nonconst_cred->usage))
+ if (!atomic_inc_not_zero(&nonconst_cred->usage))
return NULL;
validate_creds(cred);
nonconst_cred->non_rcu = 0;
@@ -284,7 +284,7 @@
if (cred) {
validate_creds(cred);
- if (atomic_long_dec_and_test(&(cred)->usage))
+ if (atomic_dec_and_test(&(cred)->usage))
__put_cred(cred);
}
}
diff --git a/kernel/cred.c b/kernel/cred.c
index 0e23c86..bd863bc5 100644
--- a/kernel/cred.c
+++ b/kernel/cred.c
@@ -101,17 +101,17 @@
#ifdef CONFIG_DEBUG_CREDENTIALS
if (cred->magic != CRED_MAGIC_DEAD ||
- atomic_long_read(&cred->usage) != 0 ||
+ atomic_read(&cred->usage) != 0 ||
read_cred_subscribers(cred) != 0)
panic("CRED: put_cred_rcu() sees %p with"
- " mag %x, put %p, usage %ld, subscr %d\n",
+ " mag %x, put %p, usage %d, subscr %d\n",
cred, cred->magic, cred->put_addr,
- atomic_long_read(&cred->usage),
+ atomic_read(&cred->usage),
read_cred_subscribers(cred));
#else
- if (atomic_long_read(&cred->usage) != 0)
- panic("CRED: put_cred_rcu() sees %p with usage %ld\n",
- cred, atomic_long_read(&cred->usage));
+ if (atomic_read(&cred->usage) != 0)
+ panic("CRED: put_cred_rcu() sees %p with usage %d\n",
+ cred, atomic_read(&cred->usage));
#endif
security_cred_free(cred);
@@ -136,11 +136,11 @@
*/
void __put_cred(struct cred *cred)
{
- kdebug("__put_cred(%p{%ld,%d})", cred,
- atomic_long_read(&cred->usage),
+ kdebug("__put_cred(%p{%d,%d})", cred,
+ atomic_read(&cred->usage),
read_cred_subscribers(cred));
- BUG_ON(atomic_long_read(&cred->usage) != 0);
+ BUG_ON(atomic_read(&cred->usage) != 0);
#ifdef CONFIG_DEBUG_CREDENTIALS
BUG_ON(read_cred_subscribers(cred) != 0);
cred->magic = CRED_MAGIC_DEAD;
@@ -163,8 +163,8 @@
{
struct cred *cred;
- kdebug("exit_creds(%u,%p,%p,{%ld,%d})", tsk->pid, tsk->real_cred, tsk->cred,
- atomic_long_read(&tsk->cred->usage),
+ kdebug("exit_creds(%u,%p,%p,{%d,%d})", tsk->pid, tsk->real_cred, tsk->cred,
+ atomic_read(&tsk->cred->usage),
read_cred_subscribers(tsk->cred));
cred = (struct cred *) tsk->real_cred;
@@ -224,7 +224,7 @@
if (!new)
return NULL;
- atomic_long_set(&new->usage, 1);
+ atomic_set(&new->usage, 1);
#ifdef CONFIG_DEBUG_CREDENTIALS
new->magic = CRED_MAGIC;
#endif
@@ -270,7 +270,7 @@
memcpy(new, old, sizeof(struct cred));
new->non_rcu = 0;
- atomic_long_set(&new->usage, 1);
+ atomic_set(&new->usage, 1);
set_cred_subscribers(new, 0);
get_group_info(new->group_info);
get_uid(new->user);
@@ -358,8 +358,8 @@
p->real_cred = get_cred(p->cred);
get_cred(p->cred);
alter_cred_subscribers(p->cred, 2);
- kdebug("share_creds(%p{%ld,%d})",
- p->cred, atomic_long_read(&p->cred->usage),
+ kdebug("share_creds(%p{%d,%d})",
+ p->cred, atomic_read(&p->cred->usage),
read_cred_subscribers(p->cred));
inc_rlimit_ucounts(task_ucounts(p), UCOUNT_RLIMIT_NPROC, 1);
return 0;
@@ -452,8 +452,8 @@
struct task_struct *task = current;
const struct cred *old = task->real_cred;
- kdebug("commit_creds(%p{%ld,%d})", new,
- atomic_long_read(&new->usage),
+ kdebug("commit_creds(%p{%d,%d})", new,
+ atomic_read(&new->usage),
read_cred_subscribers(new));
BUG_ON(task->cred != old);
@@ -462,7 +462,7 @@
validate_creds(old);
validate_creds(new);
#endif
- BUG_ON(atomic_long_read(&new->usage) < 1);
+ BUG_ON(atomic_read(&new->usage) < 1);
get_cred(new); /* we will require a ref for the subj creds too */
@@ -536,14 +536,14 @@
*/
void abort_creds(struct cred *new)
{
- kdebug("abort_creds(%p{%ld,%d})", new,
- atomic_long_read(&new->usage),
+ kdebug("abort_creds(%p{%d,%d})", new,
+ atomic_read(&new->usage),
read_cred_subscribers(new));
#ifdef CONFIG_DEBUG_CREDENTIALS
BUG_ON(read_cred_subscribers(new) != 0);
#endif
- BUG_ON(atomic_long_read(&new->usage) < 1);
+ BUG_ON(atomic_read(&new->usage) < 1);
put_cred(new);
}
EXPORT_SYMBOL(abort_creds);
@@ -559,8 +559,8 @@
{
const struct cred *old = current->cred;
- kdebug("override_creds(%p{%ld,%d})", new,
- atomic_long_read(&new->usage),
+ kdebug("override_creds(%p{%d,%d})", new,
+ atomic_read(&new->usage),
read_cred_subscribers(new));
validate_creds(old);
@@ -583,8 +583,8 @@
trace_android_rvh_override_creds(current, new);
alter_cred_subscribers(old, -1);
- kdebug("override_creds() = %p{%ld,%d}", old,
- atomic_long_read(&old->usage),
+ kdebug("override_creds() = %p{%d,%d}", old,
+ atomic_read(&old->usage),
read_cred_subscribers(old));
return old;
}
@@ -601,8 +601,8 @@
{
const struct cred *override = current->cred;
- kdebug("revert_creds(%p{%ld,%d})", old,
- atomic_long_read(&old->usage),
+ kdebug("revert_creds(%p{%d,%d})", old,
+ atomic_read(&old->usage),
read_cred_subscribers(old));
validate_creds(old);
@@ -735,7 +735,7 @@
*new = *old;
new->non_rcu = 0;
- atomic_long_set(&new->usage, 1);
+ atomic_set(&new->usage, 1);
set_cred_subscribers(new, 0);
get_uid(new->user);
get_user_ns(new->user_ns);
@@ -849,8 +849,8 @@
cred == tsk->cred ? "[eff]" : "");
printk(KERN_ERR "CRED: ->magic=%x, put_addr=%p\n",
cred->magic, cred->put_addr);
- printk(KERN_ERR "CRED: ->usage=%ld, subscr=%d\n",
- atomic_long_read(&cred->usage),
+ printk(KERN_ERR "CRED: ->usage=%d, subscr=%d\n",
+ atomic_read(&cred->usage),
read_cred_subscribers(cred));
printk(KERN_ERR "CRED: ->*uid = { %d,%d,%d,%d }\n",
from_kuid_munged(&init_user_ns, cred->uid),
@@ -922,9 +922,9 @@
*/
void validate_creds_for_do_exit(struct task_struct *tsk)
{
- kdebug("validate_creds_for_do_exit(%p,%p{%ld,%d})",
+ kdebug("validate_creds_for_do_exit(%p,%p{%d,%d})",
tsk->real_cred, tsk->cred,
- atomic_long_read(&tsk->cred->usage),
+ atomic_read(&tsk->cred->usage),
read_cred_subscribers(tsk->cred));
__validate_process_creds(tsk, __FILE__, __LINE__);
