History

Merge tag 'ceph-for-6.18-rc1' of https://github.com/ceph/ceph-client

Pull ceph updates from Ilya Dryomov: - some messenger improvements (Eric and Max) - address an issue (also affected userspace) of incorrect permissions being granted to users who have access to multiple different CephFS instances within the same cluster (Kotresh) - a bunch of assorted CephFS fixes (Slava) * tag 'ceph-for-6.18-rc1' of https://github.com/ceph/ceph-client: ceph: add bug tracking system info to MAINTAINERS ceph: fix multifs mds auth caps issue ceph: cleanup in ceph_alloc_readdir_reply_buffer() ceph: fix potential NULL dereference issue in ceph_fill_trace() libceph: add empty check to ceph_con_get_out_msg() libceph: pass the message pointer instead of loading con->out_msg libceph: make ceph_con_get_out_msg() return the message pointer ceph: fix potential race condition on operations with CEPH_I_ODIRECT flag ceph: refactor wake_up_bit() pattern of calling ceph: fix potential race condition in ceph_ioctl_lazyio() ceph: fix overflowed constant issue in ceph_do_objects_copy() ceph: fix wrong sizeof argument issue in register_session() ceph: add checking of wait_for_completion_killable() return value ceph: make ceph_start_io_*() killable libceph: Use HMAC-SHA256 library instead of crypto_shash

Linus Torvalds committed 1 year ago

Commit 8bd92382 parents 91b436f d74d6c017 files · +323 −248Browse files

Showing the changes to include/linux (1 of 17 files). Show all

Unified · Split

include/linux/ceph/messenger.h+6−4
@@ -2,6 +2,7 @@ · 1 unmodified line
22 #ifndef __FS_CEPH_MESSENGER_H
33 #define __FS_CEPH_MESSENGER_H
44
5+#include <crypto/sha2.h>
56 #include <linux/bvec.h>
67 #include <linux/crypto.h>
78 #include <linux/kref.h>
@@ -412,7 +413,8 @@ struct ceph_connection_v2_info { · 404 unmodified lines
412413 struct ceph_msg_data_cursor in_cursor;
413414 struct ceph_msg_data_cursor out_cursor;
414415
415− struct crypto_shash *hmac_tfm; /* post-auth signature */
416+ struct hmac_sha256_key hmac_key; /* post-auth signature */
417+ bool hmac_key_set;
416418 struct crypto_aead *gcm_tfm; /* on-wire encryption */
417419 struct aead_request *gcm_req;
418420 struct crypto_wait gcm_wait;
@@ -548,12 +550,12 @@ void ceph_addr_set_port(struct ceph_entity_addr *addr, int p); · 129 unmodified lines
548550 void ceph_con_process_message(struct ceph_connection *con);
549551 int ceph_con_in_msg_alloc(struct ceph_connection *con,
550552 struct ceph_msg_header *hdr, int *skip);
551−void ceph_con_get_out_msg(struct ceph_connection *con);
553+struct ceph_msg *ceph_con_get_out_msg(struct ceph_connection *con);
552554
553555 /* messenger_v1.c */
554556 int ceph_con_v1_try_read(struct ceph_connection *con);
555557 int ceph_con_v1_try_write(struct ceph_connection *con);
556−void ceph_con_v1_revoke(struct ceph_connection *con);
558+void ceph_con_v1_revoke(struct ceph_connection *con, struct ceph_msg *msg);
557559 void ceph_con_v1_revoke_incoming(struct ceph_connection *con);
558560 bool ceph_con_v1_opened(struct ceph_connection *con);
559561 void ceph_con_v1_reset_session(struct ceph_connection *con);
@@ -562,7 +564,7 @@ void ceph_con_v1_reset_protocol(struct ceph_connection *con); · 2 unmodified lines
562564 /* messenger_v2.c */
563565 int ceph_con_v2_try_read(struct ceph_connection *con);
564566 int ceph_con_v2_try_write(struct ceph_connection *con);
565−void ceph_con_v2_revoke(struct ceph_connection *con);
567+void ceph_con_v2_revoke(struct ceph_connection *con, struct ceph_msg *msg);
566568 void ceph_con_v2_revoke_incoming(struct ceph_connection *con);
567569 bool ceph_con_v2_opened(struct ceph_connection *con);
568570 void ceph_con_v2_reset_session(struct ceph_connection *con);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t