* [PATCH] KEYS: remove unnecessary get/put of explicit dest_keyring
@ 2017-11-20 22:57 ` Eric Biggers
0 siblings, 0 replies; 15+ messages in thread
From: Eric Biggers @ 2017-11-20 22:57 UTC (permalink / raw)
To: linux-security-module
From: Eric Biggers <ebiggers@google.com>
In request_key_and_link(), in the case where the dest_keyring was
explicitly specified, there is no need to get another reference to
dest_keyring before calling key_link(), then drop it afterwards. This
is because by definition, we already have a reference to dest_keyring.
This change is useful because we'll be making
construct_get_dest_keyring() able to return an error code, and we don't
want to have to handle that error here for no reason.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
security/keys/request_key.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index e8036cd0ad54..c6880af8b411 100644
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c
@@ -546,9 +546,7 @@ struct key *request_key_and_link(struct key_type *type,
if (!IS_ERR(key_ref)) {
key = key_ref_to_ptr(key_ref);
if (dest_keyring) {
- construct_get_dest_keyring(&dest_keyring);
ret = key_link(dest_keyring, key);
- key_put(dest_keyring);
if (ret < 0) {
key_put(key);
key = ERR_PTR(ret);
--
2.15.0.448.gf294e3d99a-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH] KEYS: remove unnecessary get/put of explicit dest_keyring
@ 2017-11-20 22:57 ` Eric Biggers
0 siblings, 0 replies; 15+ messages in thread
From: Eric Biggers @ 2017-11-20 22:57 UTC (permalink / raw)
To: keyrings, David Howells; +Cc: linux-security-module, linux-kernel, Eric Biggers
From: Eric Biggers <ebiggers@google.com>
In request_key_and_link(), in the case where the dest_keyring was
explicitly specified, there is no need to get another reference to
dest_keyring before calling key_link(), then drop it afterwards. This
is because by definition, we already have a reference to dest_keyring.
This change is useful because we'll be making
construct_get_dest_keyring() able to return an error code, and we don't
want to have to handle that error here for no reason.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
security/keys/request_key.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index e8036cd0ad54..c6880af8b411 100644
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c
@@ -546,9 +546,7 @@ struct key *request_key_and_link(struct key_type *type,
if (!IS_ERR(key_ref)) {
key = key_ref_to_ptr(key_ref);
if (dest_keyring) {
- construct_get_dest_keyring(&dest_keyring);
ret = key_link(dest_keyring, key);
- key_put(dest_keyring);
if (ret < 0) {
key_put(key);
key = ERR_PTR(ret);
--
2.15.0.448.gf294e3d99a-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH] KEYS: remove unnecessary get/put of explicit dest_keyring
@ 2017-11-20 22:57 ` Eric Biggers
0 siblings, 0 replies; 15+ messages in thread
From: Eric Biggers @ 2017-11-20 22:57 UTC (permalink / raw)
To: linux-security-module
From: Eric Biggers <ebiggers@google.com>
In request_key_and_link(), in the case where the dest_keyring was
explicitly specified, there is no need to get another reference to
dest_keyring before calling key_link(), then drop it afterwards. This
is because by definition, we already have a reference to dest_keyring.
This change is useful because we'll be making
construct_get_dest_keyring() able to return an error code, and we don't
want to have to handle that error here for no reason.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
security/keys/request_key.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index e8036cd0ad54..c6880af8b411 100644
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c
@@ -546,9 +546,7 @@ struct key *request_key_and_link(struct key_type *type,
if (!IS_ERR(key_ref)) {
key = key_ref_to_ptr(key_ref);
if (dest_keyring) {
- construct_get_dest_keyring(&dest_keyring);
ret = key_link(dest_keyring, key);
- key_put(dest_keyring);
if (ret < 0) {
key_put(key);
key = ERR_PTR(ret);
--
2.15.0.448.gf294e3d99a-goog
--
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@ http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH] KEYS: remove unnecessary get/put of explicit dest_keyring
2017-11-20 22:57 ` Eric Biggers
(?)
@ 2017-11-24 15:52 ` David Howells
-1 siblings, 0 replies; 15+ messages in thread
From: David Howells @ 2017-11-24 15:52 UTC (permalink / raw)
To: linux-security-module
Eric Biggers <ebiggers3@gmail.com> wrote:
> - construct_get_dest_keyring(&dest_keyring);
This will break. construct_get_dest_keyring() does other things than just
getting a ref on whatever dest_keyring points to.
David
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] KEYS: remove unnecessary get/put of explicit dest_keyring
@ 2017-11-24 15:52 ` David Howells
0 siblings, 0 replies; 15+ messages in thread
From: David Howells @ 2017-11-24 15:52 UTC (permalink / raw)
To: Eric Biggers
Cc: dhowells, keyrings, linux-security-module, linux-kernel, Eric Biggers
Eric Biggers <ebiggers3@gmail.com> wrote:
> - construct_get_dest_keyring(&dest_keyring);
This will break. construct_get_dest_keyring() does other things than just
getting a ref on whatever dest_keyring points to.
David
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH] KEYS: remove unnecessary get/put of explicit dest_keyring
@ 2017-11-24 15:52 ` David Howells
0 siblings, 0 replies; 15+ messages in thread
From: David Howells @ 2017-11-24 15:52 UTC (permalink / raw)
To: linux-security-module
Eric Biggers <ebiggers3@gmail.com> wrote:
> - construct_get_dest_keyring(&dest_keyring);
This will break. construct_get_dest_keyring() does other things than just
getting a ref on whatever dest_keyring points to.
David
--
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
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] KEYS: remove unnecessary get/put of explicit dest_keyring
2017-11-24 15:52 ` David Howells
(?)
@ 2017-11-24 20:37 ` Eric Biggers
-1 siblings, 0 replies; 15+ messages in thread
From: Eric Biggers @ 2017-11-24 20:37 UTC (permalink / raw)
To: linux-security-module
On Fri, Nov 24, 2017 at 03:52:05PM +0000, David Howells wrote:
> Eric Biggers <ebiggers3@gmail.com> wrote:
>
> > - construct_get_dest_keyring(&dest_keyring);
>
> This will break. construct_get_dest_keyring() does other things than just
> getting a ref on whatever dest_keyring points to.
>
Not if dest_keyring is non-NULL (i.e. explicitly specified), which it is in this
case.
Eric
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] KEYS: remove unnecessary get/put of explicit dest_keyring
@ 2017-11-24 20:37 ` Eric Biggers
0 siblings, 0 replies; 15+ messages in thread
From: Eric Biggers @ 2017-11-24 20:37 UTC (permalink / raw)
To: David Howells; +Cc: keyrings, linux-security-module, linux-kernel, Eric Biggers
On Fri, Nov 24, 2017 at 03:52:05PM +0000, David Howells wrote:
> Eric Biggers <ebiggers3@gmail.com> wrote:
>
> > - construct_get_dest_keyring(&dest_keyring);
>
> This will break. construct_get_dest_keyring() does other things than just
> getting a ref on whatever dest_keyring points to.
>
Not if dest_keyring is non-NULL (i.e. explicitly specified), which it is in this
case.
Eric
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH] KEYS: remove unnecessary get/put of explicit dest_keyring
@ 2017-11-24 20:37 ` Eric Biggers
0 siblings, 0 replies; 15+ messages in thread
From: Eric Biggers @ 2017-11-24 20:37 UTC (permalink / raw)
To: linux-security-module
On Fri, Nov 24, 2017 at 03:52:05PM +0000, David Howells wrote:
> Eric Biggers <ebiggers3@gmail.com> wrote:
>
> > - construct_get_dest_keyring(&dest_keyring);
>
> This will break. construct_get_dest_keyring() does other things than just
> getting a ref on whatever dest_keyring points to.
>
Not if dest_keyring is non-NULL (i.e. explicitly specified), which it is in this
case.
Eric
--
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
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] KEYS: remove unnecessary get/put of explicit dest_keyring
2017-11-24 15:52 ` David Howells
(?)
@ 2017-11-24 21:18 ` David Howells
-1 siblings, 0 replies; 15+ messages in thread
From: David Howells @ 2017-11-24 21:18 UTC (permalink / raw)
To: linux-security-module
Eric Biggers <ebiggers3@gmail.com> wrote:
> > > - construct_get_dest_keyring(&dest_keyring);
> >
> > This will break. construct_get_dest_keyring() does other things than just
> > getting a ref on whatever dest_keyring points to.
> >
>
> Not if dest_keyring is non-NULL (i.e. explicitly specified), which it is in
> this case.
Actually, you're right.
David
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] KEYS: remove unnecessary get/put of explicit dest_keyring
@ 2017-11-24 21:18 ` David Howells
0 siblings, 0 replies; 15+ messages in thread
From: David Howells @ 2017-11-24 21:18 UTC (permalink / raw)
To: Eric Biggers
Cc: dhowells, keyrings, linux-security-module, linux-kernel, Eric Biggers
Eric Biggers <ebiggers3@gmail.com> wrote:
> > > - construct_get_dest_keyring(&dest_keyring);
> >
> > This will break. construct_get_dest_keyring() does other things than just
> > getting a ref on whatever dest_keyring points to.
> >
>
> Not if dest_keyring is non-NULL (i.e. explicitly specified), which it is in
> this case.
Actually, you're right.
David
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH] KEYS: remove unnecessary get/put of explicit dest_keyring
@ 2017-11-24 21:18 ` David Howells
0 siblings, 0 replies; 15+ messages in thread
From: David Howells @ 2017-11-24 21:18 UTC (permalink / raw)
To: linux-security-module
Eric Biggers <ebiggers3@gmail.com> wrote:
> > > - construct_get_dest_keyring(&dest_keyring);
> >
> > This will break. construct_get_dest_keyring() does other things than just
> > getting a ref on whatever dest_keyring points to.
> >
>
> Not if dest_keyring is non-NULL (i.e. explicitly specified), which it is in
> this case.
Actually, you're right.
David
--
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
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] KEYS: remove unnecessary get/put of explicit dest_keyring
2017-11-20 22:57 ` Eric Biggers
(?)
@ 2017-11-24 21:24 ` David Howells
-1 siblings, 0 replies; 15+ messages in thread
From: David Howells @ 2017-11-24 21:24 UTC (permalink / raw)
To: linux-security-module
Eric Biggers <ebiggers3@gmail.com> wrote:
> if (dest_keyring) {
> - construct_get_dest_keyring(&dest_keyring);
Actually, I think I have the order of these lines inverted.
construct_get_dest_keyring() can actually return without setting dest_keyring
to anything. This didn't used to be the case, but now that the user-session
keyring is made lazily, there's no guaranteed fallback.
David
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] KEYS: remove unnecessary get/put of explicit dest_keyring
@ 2017-11-24 21:24 ` David Howells
0 siblings, 0 replies; 15+ messages in thread
From: David Howells @ 2017-11-24 21:24 UTC (permalink / raw)
To: Eric Biggers
Cc: dhowells, keyrings, linux-security-module, linux-kernel, Eric Biggers
Eric Biggers <ebiggers3@gmail.com> wrote:
> if (dest_keyring) {
> - construct_get_dest_keyring(&dest_keyring);
Actually, I think I have the order of these lines inverted.
construct_get_dest_keyring() can actually return without setting dest_keyring
to anything. This didn't used to be the case, but now that the user-session
keyring is made lazily, there's no guaranteed fallback.
David
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH] KEYS: remove unnecessary get/put of explicit dest_keyring
@ 2017-11-24 21:24 ` David Howells
0 siblings, 0 replies; 15+ messages in thread
From: David Howells @ 2017-11-24 21:24 UTC (permalink / raw)
To: linux-security-module
Eric Biggers <ebiggers3@gmail.com> wrote:
> if (dest_keyring) {
> - construct_get_dest_keyring(&dest_keyring);
Actually, I think I have the order of these lines inverted.
construct_get_dest_keyring() can actually return without setting dest_keyring
to anything. This didn't used to be the case, but now that the user-session
keyring is made lazily, there's no guaranteed fallback.
David
--
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
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2017-11-24 21:24 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-20 22:57 [PATCH] KEYS: remove unnecessary get/put of explicit dest_keyring Eric Biggers
2017-11-20 22:57 ` Eric Biggers
2017-11-20 22:57 ` Eric Biggers
2017-11-24 15:52 ` David Howells
2017-11-24 15:52 ` David Howells
2017-11-24 15:52 ` David Howells
2017-11-24 20:37 ` Eric Biggers
2017-11-24 20:37 ` Eric Biggers
2017-11-24 20:37 ` Eric Biggers
2017-11-24 21:18 ` David Howells
2017-11-24 21:18 ` David Howells
2017-11-24 21:18 ` David Howells
2017-11-24 21:24 ` David Howells
2017-11-24 21:24 ` David Howells
2017-11-24 21:24 ` David Howells
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.