Skip to content

Commit cdbc983

Browse files
committed
libceph: fix invalid accesses to ceph_connection_v1_info
There is a place where generic code in messenger.c is reading and another place where it is writing to con->v1 union member without checking that the union member is active (i.e. msgr1 is in use). On 64-bit systems, con->v1.auth_retry overlaps with con->v2.out_iter, so such a read is almost guaranteed to return a bogus value instead of 0 when msgr2 is in use. This ends up being fairly benign because the side effect is just the invalidation of the authorizer and successive fetching of new tickets. con->v1.connect_seq overlaps with con->v2.conn_bufs and the fact that it's being written to can cause more serious consequences, but luckily it's not something that happens often. Cc: [email protected] Fixes: cd1a677 ("libceph, ceph: implement msgr2.1 protocol (crc and secure modes)") Signed-off-by: Ilya Dryomov <[email protected]> Reviewed-by: Viacheslav Dubeyko <[email protected]>
1 parent 249e0a4 commit cdbc983

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

net/ceph/messenger.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1524,7 +1524,7 @@ static void con_fault_finish(struct ceph_connection *con)
15241524
* in case we faulted due to authentication, invalidate our
15251525
* current tickets so that we can get new ones.
15261526
*/
1527-
if (con->v1.auth_retry) {
1527+
if (!ceph_msgr2(from_msgr(con->msgr)) && con->v1.auth_retry) {
15281528
dout("auth_retry %d, invalidating\n", con->v1.auth_retry);
15291529
if (con->ops->invalidate_authorizer)
15301530
con->ops->invalidate_authorizer(con);
@@ -1714,9 +1714,10 @@ static void clear_standby(struct ceph_connection *con)
17141714
{
17151715
/* come back from STANDBY? */
17161716
if (con->state == CEPH_CON_S_STANDBY) {
1717-
dout("clear_standby %p and ++connect_seq\n", con);
1717+
dout("clear_standby %p\n", con);
17181718
con->state = CEPH_CON_S_PREOPEN;
1719-
con->v1.connect_seq++;
1719+
if (!ceph_msgr2(from_msgr(con->msgr)))
1720+
con->v1.connect_seq++;
17201721
WARN_ON(ceph_con_flag_test(con, CEPH_CON_F_WRITE_PENDING));
17211722
WARN_ON(ceph_con_flag_test(con, CEPH_CON_F_KEEPALIVE_PENDING));
17221723
}

0 commit comments

Comments
 (0)