LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] smack: Fix a bidirectional UDS connect check typo
@ 2014-12-29 14:34 Zbigniew Jasinski
2014-12-30 17:07 ` Casey Schaufler
0 siblings, 1 reply; 2+ messages in thread
From: Zbigniew Jasinski @ 2014-12-29 14:34 UTC (permalink / raw)
To: Casey Schaufler
Cc: James Morris, Serge E. Hallyn, linux-security-module, linux-kernel
The 54e70ec5eb090193b03e69d551fa6771a5a217c4 commit introduced a
bidirectional check that should have checked for mutual WRITE access
between two labels. Due to a typo subject's OUT label is checked with
object's OUT. Should be OUT to IN.
Signed-off-by: Zbigniew Jasinski <z.jasinski@samsung.com>
---
security/smack/smack_lsm.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index b774029..30f61f8 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -3313,7 +3313,7 @@ static int smack_unix_stream_connect(struct sock *sock,
if (!smack_privileged(CAP_MAC_OVERRIDE)) {
skp = ssp->smk_out;
- okp = osp->smk_out;
+ okp = osp->smk_in;
#ifdef CONFIG_AUDIT
smk_ad_init_net(&ad, __func__, LSM_AUDIT_DATA_NET, &net);
smk_ad_setfield_u_net_sk(&ad, other);
@@ -3321,6 +3321,8 @@ static int smack_unix_stream_connect(struct sock *sock,
rc = smk_access(skp, okp, MAY_WRITE, &ad);
rc = smk_bu_note("UDS connect", skp, okp, MAY_WRITE, rc);
if (rc == 0) {
+ okp = osp->smk_out;
+ skp = ssp->smk_in;
rc = smk_access(okp, skp, MAY_WRITE, NULL);
rc = smk_bu_note("UDS connect", okp, skp,
MAY_WRITE, rc);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] smack: Fix a bidirectional UDS connect check typo
2014-12-29 14:34 [PATCH] smack: Fix a bidirectional UDS connect check typo Zbigniew Jasinski
@ 2014-12-30 17:07 ` Casey Schaufler
0 siblings, 0 replies; 2+ messages in thread
From: Casey Schaufler @ 2014-12-30 17:07 UTC (permalink / raw)
To: Zbigniew Jasinski
Cc: James Morris, Serge E. Hallyn, linux-security-module,
linux-kernel, Casey Schaufler
On 12/29/2014 6:34 AM, Zbigniew Jasinski wrote:
> The 54e70ec5eb090193b03e69d551fa6771a5a217c4 commit introduced a
> bidirectional check that should have checked for mutual WRITE access
> between two labels. Due to a typo subject's OUT label is checked with
> object's OUT. Should be OUT to IN.
>
> Signed-off-by: Zbigniew Jasinski <z.jasinski@samsung.com>
Applied to git://git.gitorious.org/smack-next/kernel.git#smack-for-3.20
> ---
> security/smack/smack_lsm.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
> index b774029..30f61f8 100644
> --- a/security/smack/smack_lsm.c
> +++ b/security/smack/smack_lsm.c
> @@ -3313,7 +3313,7 @@ static int smack_unix_stream_connect(struct sock *sock,
>
> if (!smack_privileged(CAP_MAC_OVERRIDE)) {
> skp = ssp->smk_out;
> - okp = osp->smk_out;
> + okp = osp->smk_in;
> #ifdef CONFIG_AUDIT
> smk_ad_init_net(&ad, __func__, LSM_AUDIT_DATA_NET, &net);
> smk_ad_setfield_u_net_sk(&ad, other);
> @@ -3321,6 +3321,8 @@ static int smack_unix_stream_connect(struct sock *sock,
> rc = smk_access(skp, okp, MAY_WRITE, &ad);
> rc = smk_bu_note("UDS connect", skp, okp, MAY_WRITE, rc);
> if (rc == 0) {
> + okp = osp->smk_out;
> + skp = ssp->smk_in;
> rc = smk_access(okp, skp, MAY_WRITE, NULL);
> rc = smk_bu_note("UDS connect", okp, skp,
> MAY_WRITE, rc);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-12-30 17:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-29 14:34 [PATCH] smack: Fix a bidirectional UDS connect check typo Zbigniew Jasinski
2014-12-30 17:07 ` Casey Schaufler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).