diff for duplicates of <20180130224614.GA13647@kroah.com> diff --git a/a/1.txt b/N1/1.txt index ba9c844..af90916 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,8 +22,8 @@ On Tue, Jan 30, 2018 at 11:00:04AM -0800, Mark Salyzyn wrote: > -- Mark > > --- -> ?security/selinux/hooks.c | 2 ++ -> ?1 file changed, 2 insertions(+) +> security/selinux/hooks.c | 2 ++ +> 1 file changed, 2 insertions(+) > > diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c > index 34427384605d..be68992a28cb 100644 @@ -31,13 +31,13 @@ On Tue, Jan 30, 2018 at 11:00:04AM -0800, Mark Salyzyn wrote: > +++ b/security/selinux/hooks.c > @@ -4066,6 +4066,8 @@ static int sock_has_perm(struct task_struct *task, > struct sock *sk, u32 perms) -> ???? struct lsm_network_audit net = {0,}; -> ???? u32 tsid = task_sid(task); +> struct lsm_network_audit net = {0,}; +> u32 tsid = task_sid(task); > -> +??? if (!sksec) -> +??? ??? return -EFAULT; -> ???? if (sksec->sid == SECINITSID_KERNEL) -> ???? ??? return 0; +> + if (!sksec) +> + return -EFAULT; +> if (sksec->sid == SECINITSID_KERNEL) +> return 0; > This looks sane to me as a simple 4.4-only fix. If the SELinux @@ -46,7 +46,3 @@ maintainer acks it, I can easily queue this up. thanks, greg k-h --- -To unsubscribe from this list: send the line "unsubscribe linux-security-module" in -the body of a message to majordomo at vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 03a358b..cb9a415 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,10 +2,19 @@ "ref\01516382386.2560.11.camel@tycho.nsa.gov\0" "ref\01516383672.2560.23.camel@tycho.nsa.gov\0" "ref\099c11fa6-ad9a-830c-467e-6a56e78aecf8@android.com\0" - "From\0gregkh@linuxfoundation.org (Greg KH)\0" - "Subject\0[PATCH] general protection fault in sock_has_perm\0" + "From\0Greg KH <gregkh@linuxfoundation.org>\0" + "Subject\0Re: [PATCH] general protection fault in sock_has_perm\0" "Date\0Tue, 30 Jan 2018 23:46:14 +0100\0" - "To\0linux-security-module@vger.kernel.org\0" + "To\0Mark Salyzyn <salyzyn@android.com>\0" + "Cc\0Stephen Smalley <sds@tycho.nsa.gov>" + linux-kernel@vger.kernel.org + Paul Moore <paul@paul-moore.com> + Eric Paris <eparis@parisplace.org> + James Morris <james.l.morris@oracle.com> + Serge E. Hallyn <serge@hallyn.com> + selinux@tycho.nsa.gov + linux-security-module@vger.kernel.org + " stable@vger.kernel.org\0" "\00:1\0" "b\0" "On Tue, Jan 30, 2018 at 11:00:04AM -0800, Mark Salyzyn wrote:\n" @@ -32,8 +41,8 @@ "> -- Mark\n" "> \n" "> ---\n" - "> ?security/selinux/hooks.c | 2 ++\n" - "> ?1 file changed, 2 insertions(+)\n" + "> \302\240security/selinux/hooks.c | 2 ++\n" + "> \302\2401 file changed, 2 insertions(+)\n" "> \n" "> diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c\n" "> index 34427384605d..be68992a28cb 100644\n" @@ -41,13 +50,13 @@ "> +++ b/security/selinux/hooks.c\n" "> @@ -4066,6 +4066,8 @@ static int sock_has_perm(struct task_struct *task,\n" "> struct sock *sk, u32 perms)\n" - "> ???? struct lsm_network_audit net = {0,};\n" - "> ???? u32 tsid = task_sid(task);\n" + "> \302\240\302\240\302\240\302\240 struct lsm_network_audit net = {0,};\n" + "> \302\240\302\240\302\240\302\240 u32 tsid = task_sid(task);\n" "> \n" - "> +??? if (!sksec)\n" - "> +??? ??? return -EFAULT;\n" - "> ???? if (sksec->sid == SECINITSID_KERNEL)\n" - "> ???? ??? return 0;\n" + "> +\302\240\302\240\302\240 if (!sksec)\n" + "> +\302\240\302\240\302\240 \302\240\302\240\302\240 return -EFAULT;\n" + "> \302\240\302\240\302\240\302\240 if (sksec->sid == SECINITSID_KERNEL)\n" + "> \302\240\302\240\302\240\302\240 \302\240\302\240\302\240 return 0;\n" "> \n" "\n" "This looks sane to me as a simple 4.4-only fix. If the SELinux\n" @@ -55,10 +64,6 @@ "\n" "thanks,\n" "\n" - "greg k-h\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-security-module\" in\n" - "the body of a message to majordomo at vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + greg k-h -863133bd3cc68767abcb551846cdde6ad15c213ed3e4e7f42c74c5e2029f7e4f +f4e29ef3979523c49b5c8ce241b5c39c1bd79afae018b8a2aa2ae4b3b9b97658
diff --git a/a/1.txt b/N2/1.txt index ba9c844..2aa878e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -22,8 +22,8 @@ On Tue, Jan 30, 2018 at 11:00:04AM -0800, Mark Salyzyn wrote: > -- Mark > > --- -> ?security/selinux/hooks.c | 2 ++ -> ?1 file changed, 2 insertions(+) +> �security/selinux/hooks.c | 2 ++ +> �1 file changed, 2 insertions(+) > > diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c > index 34427384605d..be68992a28cb 100644 @@ -31,13 +31,13 @@ On Tue, Jan 30, 2018 at 11:00:04AM -0800, Mark Salyzyn wrote: > +++ b/security/selinux/hooks.c > @@ -4066,6 +4066,8 @@ static int sock_has_perm(struct task_struct *task, > struct sock *sk, u32 perms) -> ???? struct lsm_network_audit net = {0,}; -> ???? u32 tsid = task_sid(task); +> ���� struct lsm_network_audit net = {0,}; +> ���� u32 tsid = task_sid(task); > -> +??? if (!sksec) -> +??? ??? return -EFAULT; -> ???? if (sksec->sid == SECINITSID_KERNEL) -> ???? ??? return 0; +> +��� if (!sksec) +> +��� ��� return -EFAULT; +> ���� if (sksec->sid == SECINITSID_KERNEL) +> ���� ��� return 0; > This looks sane to me as a simple 4.4-only fix. If the SELinux @@ -46,7 +46,3 @@ maintainer acks it, I can easily queue this up. thanks, greg k-h --- -To unsubscribe from this list: send the line "unsubscribe linux-security-module" in -the body of a message to majordomo at vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N2/content_digest index 03a358b..be1bdb6 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,10 +2,19 @@ "ref\01516382386.2560.11.camel@tycho.nsa.gov\0" "ref\01516383672.2560.23.camel@tycho.nsa.gov\0" "ref\099c11fa6-ad9a-830c-467e-6a56e78aecf8@android.com\0" - "From\0gregkh@linuxfoundation.org (Greg KH)\0" - "Subject\0[PATCH] general protection fault in sock_has_perm\0" + "From\0Greg KH <gregkh@linuxfoundation.org>\0" + "Subject\0Re: [PATCH] general protection fault in sock_has_perm\0" "Date\0Tue, 30 Jan 2018 23:46:14 +0100\0" - "To\0linux-security-module@vger.kernel.org\0" + "To\0Mark Salyzyn <salyzyn@android.com>\0" + "Cc\0Stephen Smalley <sds@tycho.nsa.gov>" + linux-kernel@vger.kernel.org + Paul Moore <paul@paul-moore.com> + Eric Paris <eparis@parisplace.org> + James Morris <james.l.morris@oracle.com> + Serge E. Hallyn <serge@hallyn.com> + selinux@tycho.nsa.gov + linux-security-module@vger.kernel.org + " stable@vger.kernel.org\0" "\00:1\0" "b\0" "On Tue, Jan 30, 2018 at 11:00:04AM -0800, Mark Salyzyn wrote:\n" @@ -32,8 +41,8 @@ "> -- Mark\n" "> \n" "> ---\n" - "> ?security/selinux/hooks.c | 2 ++\n" - "> ?1 file changed, 2 insertions(+)\n" + "> \303\257\302\277\302\275security/selinux/hooks.c | 2 ++\n" + "> \303\257\302\277\302\2751 file changed, 2 insertions(+)\n" "> \n" "> diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c\n" "> index 34427384605d..be68992a28cb 100644\n" @@ -41,13 +50,13 @@ "> +++ b/security/selinux/hooks.c\n" "> @@ -4066,6 +4066,8 @@ static int sock_has_perm(struct task_struct *task,\n" "> struct sock *sk, u32 perms)\n" - "> ???? struct lsm_network_audit net = {0,};\n" - "> ???? u32 tsid = task_sid(task);\n" + "> \303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275 struct lsm_network_audit net = {0,};\n" + "> \303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275 u32 tsid = task_sid(task);\n" "> \n" - "> +??? if (!sksec)\n" - "> +??? ??? return -EFAULT;\n" - "> ???? if (sksec->sid == SECINITSID_KERNEL)\n" - "> ???? ??? return 0;\n" + "> +\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275 if (!sksec)\n" + "> +\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275 \303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275 return -EFAULT;\n" + "> \303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275 if (sksec->sid == SECINITSID_KERNEL)\n" + "> \303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275 \303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275 return 0;\n" "> \n" "\n" "This looks sane to me as a simple 4.4-only fix. If the SELinux\n" @@ -55,10 +64,6 @@ "\n" "thanks,\n" "\n" - "greg k-h\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-security-module\" in\n" - "the body of a message to majordomo at vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + greg k-h -863133bd3cc68767abcb551846cdde6ad15c213ed3e4e7f42c74c5e2029f7e4f +f86ae98576f4a1c9ab785f64b610a6822de8fed1a6d6e087ec0020ad0926b275
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.