| Message ID | 20171004183218.4786-1-clabbe.montjoie@gmail.com |
|---|---|
| State | Accepted |
| Commit | c0d4f464caeb075e3bb9063a64cd63c093ac03ad |
| Headers | show |
| Series | [1/2] selinux: fix build warning by removing the unused sid variable | expand |
On Wed, 2017-10-04 at 20:32 +0200, Corentin Labbe wrote: > This patch remove the unused variable sid > This fix the following build warning: > security/selinux/hooks.c:2921:6: warning: variable 'sid' set but not > used [-Wunused-but-set-variable] > > Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> Acked-by: Stephen Smalley <sds@tycho.nsa.gov> > --- > security/selinux/hooks.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c > index f5d304736852..8507a56f85e4 100644 > --- a/security/selinux/hooks.c > +++ b/security/selinux/hooks.c > @@ -2918,13 +2918,12 @@ static int selinux_inode_init_security(struct > inode *inode, struct inode *dir, > { > const struct task_security_struct *tsec = > current_security(); > struct superblock_security_struct *sbsec; > - u32 sid, newsid, clen; > + u32 newsid, clen; > int rc; > char *context; > > sbsec = dir->i_sb->s_security; > > - sid = tsec->sid; > newsid = tsec->create_sid; > > rc = selinux_determine_inode_label(current_security(),
On Wed, Oct 4, 2017 at 4:26 PM, Stephen Smalley <sds@tycho.nsa.gov> wrote: > On Wed, 2017-10-04 at 20:32 +0200, Corentin Labbe wrote: >> This patch remove the unused variable sid >> This fix the following build warning: >> security/selinux/hooks.c:2921:6: warning: variable 'sid' set but not >> used [-Wunused-but-set-variable] >> >> Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> > > Acked-by: Stephen Smalley <sds@tycho.nsa.gov> Looks good to me too, merged into selinux/next. Thanks. -- paul moore www.paul-moore.com
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index f5d304736852..8507a56f85e4 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -2918,13 +2918,12 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir, { const struct task_security_struct *tsec = current_security(); struct superblock_security_struct *sbsec; - u32 sid, newsid, clen; + u32 newsid, clen; int rc; char *context; sbsec = dir->i_sb->s_security; - sid = tsec->sid; newsid = tsec->create_sid; rc = selinux_determine_inode_label(current_security(),
This patch remove the unused variable sid This fix the following build warning: security/selinux/hooks.c:2921:6: warning: variable 'sid' set but not used [-Wunused-but-set-variable] Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> --- security/selinux/hooks.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.13.6