GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-23 15:27:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

KEYS: Do some style cleanup in the key management code.

Browse source 
Do a bit of a style clean up in the key management code.  No functional
changes.

Done using:

  perl -p -i -e 's!^/[*]*/\n!!' security/keys/*.c
  perl -p -i -e 's!} /[*] end [a-z0-9_]*[(][)] [*]/\n!}\n!' security/keys/*.c
  sed -i -s -e ": next" -e N -e 's/^\n[}]$/}/' -e t -e P -e 's/^.*\n//' -e "b next" security/keys/*.c

To remove /*****/ lines, remove comments on the closing brace of a
function to name the function and remove blank lines before the closing
brace of a function.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
David Howells 2011-01-20 16:38:27 +00:00 • committed by Linus Torvalds
parent 9093ba53b7
commit a8b17ed019
10 changed files with 80 additions and 248 deletions
Download patch file Download diff file Expand all files Collapse all files

23
security/keys/process_keys.c
View file

@ -38,7 +38,6 @@ struct key_user root_key_user = {
.user_ns = &init_user_ns,
};
/*****************************************************************************/
/*
* install user and user session keyrings for a particular UID
*/
@ -275,7 +274,6 @@ static int install_session_keyring(struct key *keyring)
return commit_creds(new);
}
/*****************************************************************************/
/*
* the filesystem user ID changed
*/
@ -288,10 +286,8 @@ void key_fsuid_changed(struct task_struct *tsk)
tsk->cred->thread_keyring->uid = tsk->cred->fsuid;
up_write(&tsk->cred->thread_keyring->sem);
}
}
} /* end key_fsuid_changed() */
/*****************************************************************************/
/*
* the filesystem group ID changed
*/
@ -304,10 +300,8 @@ void key_fsgid_changed(struct task_struct *tsk)
tsk->cred->thread_keyring->gid = tsk->cred->fsgid;
up_write(&tsk->cred->thread_keyring->sem);
}
}
} /* end key_fsgid_changed() */
/*****************************************************************************/
/*
* search only my process keyrings for the first matching key
* - we use the supplied match function to see if the description (or other
@ -428,7 +422,6 @@ found:
return key_ref;
}
/*****************************************************************************/
/*
* search the process keyrings for the first matching key
* - we use the supplied match function to see if the description (or other
@ -489,20 +482,16 @@ key_ref_t search_process_keyrings(struct key_type *type,
found:
return key_ref;
}
} /* end search_process_keyrings() */
/*****************************************************************************/
/*
* see if the key we're looking at is the target key
*/
int lookup_user_key_possessed(const struct key *key, const void *target)
{
return key == target;
}
} /* end lookup_user_key_possessed() */
/*****************************************************************************/
/*
* lookup a key given a key ID from userspace with a given permissions mask
* - don't create special keyrings unless so requested
@ -711,10 +700,8 @@ invalid_key:
reget_creds:
put_cred(cred);
goto try_again;
}
} /* end lookup_user_key() */
/*****************************************************************************/
/*
* join the named keyring as the session keyring if possible, or attempt to
* create a new one of that name if not