| Message ID | 20200807165134.3913-1-rdunlap@infradead.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | security: selinux: delete repeated words in comments | expand |
On Fri, Aug 7, 2020 at 12:51 PM Randy Dunlap <rdunlap@infradead.org> wrote: > > Drop a repeated word in comments. > {open, is, then} > > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> > Cc: Paul Moore <paul@paul-moore.com> > Cc: Stephen Smalley <stephen.smalley.work@gmail.com> > Cc: Eric Paris <eparis@parisplace.org> > Cc: selinux@vger.kernel.org > Cc: James Morris <jmorris@namei.org> > Cc: "Serge E. Hallyn" <serge@hallyn.com> > Cc: linux-security-module@vger.kernel.org > --- > security/selinux/hooks.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) This obviously looks fine, but it will need to wait until after the merge window closes. I'll send another reply once it is merged. > --- linux-next-20200731.orig/security/selinux/hooks.c > +++ linux-next-20200731/security/selinux/hooks.c > @@ -1978,7 +1978,7 @@ static inline u32 file_to_av(struct file > } > > /* > - * Convert a file to an access vector and include the correct open > + * Convert a file to an access vector and include the correct > * open permission. > */ > static inline u32 open_file_to_av(struct file *file) > @@ -4444,7 +4444,7 @@ static int selinux_skb_peerlbl_sid(struc > * > * If @skb_sid is valid then the user:role:type information from @sk_sid is > * combined with the MLS information from @skb_sid in order to create > - * @conn_sid. If @skb_sid is not valid then then @conn_sid is simply a copy > + * @conn_sid. If @skb_sid is not valid then @conn_sid is simply a copy > * of @sk_sid. Returns zero on success, negative values on failure. > * > */ > @@ -5314,7 +5314,7 @@ static int selinux_sctp_bind_connect(str > > /* As selinux_sctp_bind_connect() is called by the > * SCTP protocol layer, the socket is already locked, > - * therefore selinux_netlbl_socket_connect_locked() is > + * therefore selinux_netlbl_socket_connect_locked() > * is called here. The situations handled are: > * sctp_connectx(3), sctp_sendmsg(3), sendmsg(2), > * whenever a new IP address is added or when a new
On Fri, Aug 7, 2020 at 2:09 PM Paul Moore <paul@paul-moore.com> wrote: > On Fri, Aug 7, 2020 at 12:51 PM Randy Dunlap <rdunlap@infradead.org> wrote: > > > > Drop a repeated word in comments. > > {open, is, then} > > > > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> > > Cc: Paul Moore <paul@paul-moore.com> > > Cc: Stephen Smalley <stephen.smalley.work@gmail.com> > > Cc: Eric Paris <eparis@parisplace.org> > > Cc: selinux@vger.kernel.org > > Cc: James Morris <jmorris@namei.org> > > Cc: "Serge E. Hallyn" <serge@hallyn.com> > > Cc: linux-security-module@vger.kernel.org > > --- > > security/selinux/hooks.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > This obviously looks fine, but it will need to wait until after the > merge window closes. I'll send another reply once it is merged. Hi Randy, this got buried a bit due to vacations and other patches but I just merged it into selinux/next. Thanks for your patience.
--- linux-next-20200731.orig/security/selinux/hooks.c +++ linux-next-20200731/security/selinux/hooks.c @@ -1978,7 +1978,7 @@ static inline u32 file_to_av(struct file } /* - * Convert a file to an access vector and include the correct open + * Convert a file to an access vector and include the correct * open permission. */ static inline u32 open_file_to_av(struct file *file) @@ -4444,7 +4444,7 @@ static int selinux_skb_peerlbl_sid(struc * * If @skb_sid is valid then the user:role:type information from @sk_sid is * combined with the MLS information from @skb_sid in order to create - * @conn_sid. If @skb_sid is not valid then then @conn_sid is simply a copy + * @conn_sid. If @skb_sid is not valid then @conn_sid is simply a copy * of @sk_sid. Returns zero on success, negative values on failure. * */ @@ -5314,7 +5314,7 @@ static int selinux_sctp_bind_connect(str /* As selinux_sctp_bind_connect() is called by the * SCTP protocol layer, the socket is already locked, - * therefore selinux_netlbl_socket_connect_locked() is + * therefore selinux_netlbl_socket_connect_locked() * is called here. The situations handled are: * sctp_connectx(3), sctp_sendmsg(3), sendmsg(2), * whenever a new IP address is added or when a new
Drop a repeated word in comments. {open, is, then} Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Cc: Paul Moore <paul@paul-moore.com> Cc: Stephen Smalley <stephen.smalley.work@gmail.com> Cc: Eric Paris <eparis@parisplace.org> Cc: selinux@vger.kernel.org Cc: James Morris <jmorris@namei.org> Cc: "Serge E. Hallyn" <serge@hallyn.com> Cc: linux-security-module@vger.kernel.org --- security/selinux/hooks.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)