* [PATCH 4.9] libceph: fix CEPH_FEATURE_CEPHX_V2 check in calc_signature()
@ 2019-01-09 14:17 Ilya Dryomov
2019-01-09 16:28 ` Ben Hutchings
0 siblings, 1 reply; 2+ messages in thread
From: Ilya Dryomov @ 2019-01-09 14:17 UTC (permalink / raw)
To: Ben Hutchings, Greg Kroah-Hartman; +Cc: stable
Upstream commit cc255c76c70f ("libceph: implement CEPHX_V2 calculation
mode") was adjusted incorrectly: CEPH_FEATURE_CEPHX_V2 if condition got
inverted, thus breaking 4.9.144 and later kernels for all setups that
use cephx.
Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---
net/ceph/auth_x.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/ceph/auth_x.c b/net/ceph/auth_x.c
index 29e23b5cb2ed..a4896e4a1c9a 100644
--- a/net/ceph/auth_x.c
+++ b/net/ceph/auth_x.c
@@ -804,7 +804,7 @@ static int calc_signature(struct ceph_x_authorizer *au, struct ceph_msg *msg,
void *enc_buf = au->enc_buf;
int ret;
- if (msg->con->peer_features & CEPH_FEATURE_CEPHX_V2) {
+ if (!(msg->con->peer_features & CEPH_FEATURE_CEPHX_V2)) {
struct {
__le32 len;
__le32 header_crc;
--
2.14.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 4.9] libceph: fix CEPH_FEATURE_CEPHX_V2 check in calc_signature()
2019-01-09 14:17 [PATCH 4.9] libceph: fix CEPH_FEATURE_CEPHX_V2 check in calc_signature() Ilya Dryomov
@ 2019-01-09 16:28 ` Ben Hutchings
0 siblings, 0 replies; 2+ messages in thread
From: Ben Hutchings @ 2019-01-09 16:28 UTC (permalink / raw)
To: Ilya Dryomov, Greg Kroah-Hartman; +Cc: stable
On Wed, 2019-01-09 at 15:17 +0100, Ilya Dryomov wrote:
> Upstream commit cc255c76c70f ("libceph: implement CEPHX_V2 calculation
> mode") was adjusted incorrectly: CEPH_FEATURE_CEPHX_V2 if condition got
> inverted, thus breaking 4.9.144 and later kernels for all setups that
> use cephx.
Whoa, sorry about that.
Ben.
> Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>
> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
> ---
> net/ceph/auth_x.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/ceph/auth_x.c b/net/ceph/auth_x.c
> index 29e23b5cb2ed..a4896e4a1c9a 100644
> --- a/net/ceph/auth_x.c
> +++ b/net/ceph/auth_x.c
> @@ -804,7 +804,7 @@ static int calc_signature(struct ceph_x_authorizer *au, struct ceph_msg *msg,
> void *enc_buf = au->enc_buf;
> int ret;
>
> - if (msg->con->peer_features & CEPH_FEATURE_CEPHX_V2) {
> + if (!(msg->con->peer_features & CEPH_FEATURE_CEPHX_V2)) {
> struct {
> __le32 len;
> __le32 header_crc;
--
Ben Hutchings, Software Developer Codethink Ltd
https://www.codethink.co.uk/ Dale House, 35 Dale Street
Manchester, M1 2HF, United Kingdom
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-09 16:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-09 14:17 [PATCH 4.9] libceph: fix CEPH_FEATURE_CEPHX_V2 check in calc_signature() Ilya Dryomov
2019-01-09 16:28 ` Ben Hutchings
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).