| Message ID | 20180401084205.GA14512@ircssh-2.c.rugged-nimbus-611.internal (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Apr 1, 2018 at 1:42 AM, Sargun Dhillon <sargun@sargun.me> wrote: > security_settime was a wrapper around security_settime64. There are no more > users of it. Therefore it can be removed. It was removed in: > commit 4eb1bca17933 ("time: Use do_settimeofday64() internally") > > Signed-off-by: Sargun Dhillon <sargun@sargun.me> > --- > include/linux/security.h | 14 -------------- > 1 file changed, 14 deletions(-) > > diff --git a/include/linux/security.h b/include/linux/security.h > index 3f5fd988ee87..5111fe8159ce 100644 > --- a/include/linux/security.h > +++ b/include/linux/security.h > @@ -222,12 +222,6 @@ int security_quotactl(int cmds, int type, int id, struct super_block *sb); > int security_quota_on(struct dentry *dentry); > int security_syslog(int type); > int security_settime64(const struct timespec64 *ts, const struct timezone *tz); > -static inline int security_settime(const struct timespec *ts, const struct timezone *tz) > -{ > - struct timespec64 ts64 = timespec_to_timespec64(*ts); > - > - return security_settime64(&ts64, tz); > -} > int security_vm_enough_memory_mm(struct mm_struct *mm, long pages); > int security_bprm_set_creds(struct linux_binprm *bprm); > int security_bprm_check(struct linux_binprm *bprm); > @@ -509,14 +503,6 @@ static inline int security_settime64(const struct timespec64 *ts, > return cap_settime(ts, tz); > } > > -static inline int security_settime(const struct timespec *ts, > - const struct timezone *tz) > -{ > - struct timespec64 ts64 = timespec_to_timespec64(*ts); > - > - return cap_settime(&ts64, tz); > -} > - > static inline int security_vm_enough_memory_mm(struct mm_struct *mm, long pages) > { > return __vm_enough_memory(mm, pages, cap_vm_enough_memory(mm, pages)); > -- > 2.14.1 > Did anybody get a chance to look at this? -- To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, 7 Apr 2018, Sargun Dhillon wrote:
> Did anybody get a chance to look at this?
This was submitted on the opening of the merge window, so not yet.
On Sun, 1 Apr 2018, Sargun Dhillon wrote: > security_settime was a wrapper around security_settime64. There are no more > users of it. Therefore it can be removed. It was removed in: > commit 4eb1bca17933 ("time: Use do_settimeofday64() internally") > > Signed-off-by: Sargun Dhillon <sargun@sargun.me> Applied to git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next-general and next-testing
diff --git a/include/linux/security.h b/include/linux/security.h index 3f5fd988ee87..5111fe8159ce 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -222,12 +222,6 @@ int security_quotactl(int cmds, int type, int id, struct super_block *sb); int security_quota_on(struct dentry *dentry); int security_syslog(int type); int security_settime64(const struct timespec64 *ts, const struct timezone *tz); -static inline int security_settime(const struct timespec *ts, const struct timezone *tz) -{ - struct timespec64 ts64 = timespec_to_timespec64(*ts); - - return security_settime64(&ts64, tz); -} int security_vm_enough_memory_mm(struct mm_struct *mm, long pages); int security_bprm_set_creds(struct linux_binprm *bprm); int security_bprm_check(struct linux_binprm *bprm); @@ -509,14 +503,6 @@ static inline int security_settime64(const struct timespec64 *ts, return cap_settime(ts, tz); } -static inline int security_settime(const struct timespec *ts, - const struct timezone *tz) -{ - struct timespec64 ts64 = timespec_to_timespec64(*ts); - - return cap_settime(&ts64, tz); -} - static inline int security_vm_enough_memory_mm(struct mm_struct *mm, long pages) { return __vm_enough_memory(mm, pages, cap_vm_enough_memory(mm, pages));
security_settime was a wrapper around security_settime64. There are no more users of it. Therefore it can be removed. It was removed in: commit 4eb1bca17933 ("time: Use do_settimeofday64() internally") Signed-off-by: Sargun Dhillon <sargun@sargun.me> --- include/linux/security.h | 14 -------------- 1 file changed, 14 deletions(-)