* [PATCH] fscrypt: zeroize fscrypt_info before freeing
@ 2019-10-09 23:44 Eric Biggers
2019-10-21 20:28 ` Eric Biggers
0 siblings, 1 reply; 3+ messages in thread
From: Eric Biggers @ 2019-10-09 23:44 UTC (permalink / raw)
To: linux-fscrypt; +Cc: Theodore Y . Ts'o, Jaegeuk Kim
From: Eric Biggers <ebiggers@google.com>
memset the struct fscrypt_info to zero before freeing. This isn't
really needed currently, since there's no secret key directly in the
fscrypt_info. But there's a decent chance that someone will add such a
field in the future, e.g. in order to use an API that takes a raw key
such as siphash(). So it's good to do this as a hardening measure.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
fs/crypto/keysetup.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/fs/crypto/keysetup.c b/fs/crypto/keysetup.c
index df3e1c8653884..0ba33e010312f 100644
--- a/fs/crypto/keysetup.c
+++ b/fs/crypto/keysetup.c
@@ -325,6 +325,7 @@ static void put_crypt_info(struct fscrypt_info *ci)
key_invalidate(key);
key_put(key);
}
+ memzero_explicit(ci, sizeof(*ci));
kmem_cache_free(fscrypt_info_cachep, ci);
}
--
2.23.0.581.g78d2f28ef7-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] fscrypt: zeroize fscrypt_info before freeing
2019-10-09 23:44 [PATCH] fscrypt: zeroize fscrypt_info before freeing Eric Biggers
@ 2019-10-21 20:28 ` Eric Biggers
2019-10-21 20:28 ` Eric Biggers
0 siblings, 1 reply; 3+ messages in thread
From: Eric Biggers @ 2019-10-21 20:28 UTC (permalink / raw)
To: linux-fscrypt; +Cc: Theodore Y . Ts'o, Jaegeuk Kim
On Wed, Oct 09, 2019 at 04:44:42PM -0700, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
>
> memset the struct fscrypt_info to zero before freeing. This isn't
> really needed currently, since there's no secret key directly in the
> fscrypt_info. But there's a decent chance that someone will add such a
> field in the future, e.g. in order to use an API that takes a raw key
> such as siphash(). So it's good to do this as a hardening measure.
>
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> ---
> fs/crypto/keysetup.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/fs/crypto/keysetup.c b/fs/crypto/keysetup.c
> index df3e1c8653884..0ba33e010312f 100644
> --- a/fs/crypto/keysetup.c
> +++ b/fs/crypto/keysetup.c
> @@ -325,6 +325,7 @@ static void put_crypt_info(struct fscrypt_info *ci)
> key_invalidate(key);
> key_put(key);
> }
> + memzero_explicit(ci, sizeof(*ci));
> kmem_cache_free(fscrypt_info_cachep, ci);
> }
>
> --
> 2.23.0.581.g78d2f28ef7-goog
>
Applied to fscrypt.git for 5.5.
- Eric
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] fscrypt: zeroize fscrypt_info before freeing
2019-10-21 20:28 ` Eric Biggers
@ 2019-10-21 20:28 ` Eric Biggers
0 siblings, 0 replies; 3+ messages in thread
From: Eric Biggers @ 2019-10-21 20:28 UTC (permalink / raw)
To: linux-fscrypt; +Cc: Theodore Y . Ts'o, Jaegeuk Kim
On Wed, Oct 09, 2019 at 04:44:42PM -0700, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
>
> memset the struct fscrypt_info to zero before freeing. This isn't
> really needed currently, since there's no secret key directly in the
> fscrypt_info. But there's a decent chance that someone will add such a
> field in the future, e.g. in order to use an API that takes a raw key
> such as siphash(). So it's good to do this as a hardening measure.
>
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> ---
> fs/crypto/keysetup.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/fs/crypto/keysetup.c b/fs/crypto/keysetup.c
> index df3e1c8653884..0ba33e010312f 100644
> --- a/fs/crypto/keysetup.c
> +++ b/fs/crypto/keysetup.c
> @@ -325,6 +325,7 @@ static void put_crypt_info(struct fscrypt_info *ci)
> key_invalidate(key);
> key_put(key);
> }
> + memzero_explicit(ci, sizeof(*ci));
> kmem_cache_free(fscrypt_info_cachep, ci);
> }
>
> --
> 2.23.0.581.g78d2f28ef7-goog
>
Applied to fscrypt.git for 5.5.
- Eric
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-21 20:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-09 23:44 [PATCH] fscrypt: zeroize fscrypt_info before freeing Eric Biggers
2019-10-21 20:28 ` Eric Biggers
2019-10-21 20:28 ` Eric Biggers
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).