Skip to content

Commit

Permalink
TOMOYO: Remove unused parameter.
Browse files Browse the repository at this point in the history
TOMOYO 2.2.0 does not check argv[] and envp[] upon execve().
We don't need to pass "struct tomoyo_page_buffer".

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: James Morris <jmorris@namei.org>
  • Loading branch information
Tetsuo Handa authored and James Morris committed Jun 4, 2009
1 parent e0a94c2 commit bcb8697
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion security/tomoyo/domain.c
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ int tomoyo_find_next_domain(struct linux_binprm *bprm,
}

/* Check execute permission. */
retval = tomoyo_check_exec_perm(old_domain, &r, tmp);
retval = tomoyo_check_exec_perm(old_domain, &r);
if (retval < 0)
goto out;

Expand Down
4 changes: 1 addition & 3 deletions security/tomoyo/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -1012,13 +1012,11 @@ int tomoyo_check_file_perm(struct tomoyo_domain_info *domain,
*
* @domain: Pointer to "struct tomoyo_domain_info".
* @filename: Check permission for "execute".
* @tmp: Buffer for temporary use.
*
* Returns 0 on success, negativevalue otherwise.
*/
int tomoyo_check_exec_perm(struct tomoyo_domain_info *domain,
const struct tomoyo_path_info *filename,
struct tomoyo_page_buffer *tmp)
const struct tomoyo_path_info *filename)
{
const u8 mode = tomoyo_check_flags(domain, TOMOYO_MAC_FOR_FILE);

Expand Down
4 changes: 1 addition & 3 deletions security/tomoyo/tomoyo.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ struct path;
struct inode;
struct linux_binprm;
struct pt_regs;
struct tomoyo_page_buffer;

int tomoyo_check_file_perm(struct tomoyo_domain_info *domain,
const char *filename, const u8 perm);
int tomoyo_check_exec_perm(struct tomoyo_domain_info *domain,
const struct tomoyo_path_info *filename,
struct tomoyo_page_buffer *buf);
const struct tomoyo_path_info *filename);
int tomoyo_check_open_permission(struct tomoyo_domain_info *domain,
struct path *path, const int flag);
int tomoyo_check_1path_perm(struct tomoyo_domain_info *domain,
Expand Down

0 comments on commit bcb8697

Please sign in to comment.