* [PATCH] Smack: fix a NULL dereference in wrong smack_import_entry() usage
@ 2015-08-25 10:39 Lukasz Pawelczyk
2015-10-09 22:19 ` Casey Schaufler
0 siblings, 1 reply; 2+ messages in thread
From: Lukasz Pawelczyk @ 2015-08-25 10:39 UTC (permalink / raw)
To: Casey Schaufler, James Morris, Serge E. Hallyn,
linux-security-module, linux-kernel
Cc: havner, Lukasz Pawelczyk
The e774ad683f425a51f87711164ea166d9dcc41477 commit made this function
return proper error codes instead of NULL. Reflect that.
This is a fix for a NULL dereference introduced in
21abb1ec414c75abe32c3854848ff30e2b4a6113:
echo "$SOME_IPV6_ADDR \"test" > /smack/ipv6host
(this should return EINVAL, it doesn't)
cat /smack/ipv6host
(derefences 0x000a)
Signed-off-by: Lukasz Pawelczyk <l.pawelczyk@samsung.com>
---
security/smack/smackfs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
index c20b154..103a619 100644
--- a/security/smack/smackfs.c
+++ b/security/smack/smackfs.c
@@ -1501,8 +1501,8 @@ static ssize_t smk_write_net6addr(struct file *file, const char __user *buf,
*/
if (smack[0] != '-') {
skp = smk_import_entry(smack, 0);
- if (skp == NULL) {
- rc = -EINVAL;
+ if (IS_ERR(skp)) {
+ rc = PTR_ERR(skp);
goto free_out;
}
} else {
--
2.4.3
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] Smack: fix a NULL dereference in wrong smack_import_entry() usage
2015-08-25 10:39 [PATCH] Smack: fix a NULL dereference in wrong smack_import_entry() usage Lukasz Pawelczyk
@ 2015-10-09 22:19 ` Casey Schaufler
0 siblings, 0 replies; 2+ messages in thread
From: Casey Schaufler @ 2015-10-09 22:19 UTC (permalink / raw)
To: Lukasz Pawelczyk, James Morris, Serge E. Hallyn,
linux-security-module, linux-kernel
Cc: havner
On 8/25/2015 3:39 AM, Lukasz Pawelczyk wrote:
> The e774ad683f425a51f87711164ea166d9dcc41477 commit made this function
> return proper error codes instead of NULL. Reflect that.
>
> This is a fix for a NULL dereference introduced in
> 21abb1ec414c75abe32c3854848ff30e2b4a6113:
>
> echo "$SOME_IPV6_ADDR \"test" > /smack/ipv6host
> (this should return EINVAL, it doesn't)
> cat /smack/ipv6host
> (derefences 0x000a)
>
> Signed-off-by: Lukasz Pawelczyk <l.pawelczyk@samsung.com>
Acked-by: Casey Schaufler <casey@schaufler-ca.com>
Applied to https://github.com/cschaufler/smack-next.git#smack-for-4.4
> ---
> security/smack/smackfs.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
> index c20b154..103a619 100644
> --- a/security/smack/smackfs.c
> +++ b/security/smack/smackfs.c
> @@ -1501,8 +1501,8 @@ static ssize_t smk_write_net6addr(struct file *file, const char __user *buf,
> */
> if (smack[0] != '-') {
> skp = smk_import_entry(smack, 0);
> - if (skp == NULL) {
> - rc = -EINVAL;
> + if (IS_ERR(skp)) {
> + rc = PTR_ERR(skp);
> goto free_out;
> }
> } else {
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-10-09 22:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-08-25 10:39 [PATCH] Smack: fix a NULL dereference in wrong smack_import_entry() usage Lukasz Pawelczyk
2015-10-09 22:19 ` Casey Schaufler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome