Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'ceph-for-6.6-rc6' of https://github.com/ceph/ceph-client
Pull ceph fixes from Ilya Dryomov:
"Fixes for an overreaching WARN_ON, two error paths and a switch to
kernel_connect() which recently grown protection against someone using
BPF to rewrite the address.
All but one marked for stable"
* tag 'ceph-for-6.6-rc6' of https://github.com/ceph/ceph-client:
ceph: fix type promotion bug on 32bit systems
libceph: use kernel_connect()
ceph: remove unnecessary IS_ERR() check in ceph_fname_to_usr()
ceph: fix incorrect revoked caps assert in ceph_fill_file_size()
+5
-7
+1
-1
fs/ceph/crypto.c
+1
-1
fs/ceph/crypto.c
+1
-1
fs/ceph/file.c
+1
-1
fs/ceph/file.c
···
2969
2969
ret = do_splice_direct(src_file, &src_off, dst_file,
2970
2970
&dst_off, src_objlen, flags);
2971
2971
/* Abort on short copies or on error */
2972
-
if (ret < src_objlen) {
2972
+
if (ret < (long)src_objlen) {
2973
2973
dout("Failed partial copy (%zd)\n", ret);
2974
2974
goto out;
2975
2975
}
+1
-3
fs/ceph/inode.c
+1
-3
fs/ceph/inode.c
···
769
769
ci->i_truncate_seq = truncate_seq;
770
770
771
771
/* the MDS should have revoked these caps */
772
-
WARN_ON_ONCE(issued & (CEPH_CAP_FILE_EXCL |
773
-
CEPH_CAP_FILE_RD |
774
-
CEPH_CAP_FILE_WR |
772
+
WARN_ON_ONCE(issued & (CEPH_CAP_FILE_RD |
775
773
CEPH_CAP_FILE_LAZYIO));
776
774
/*
777
775
* If we hold relevant caps, or in the case where we're
+2
-2
net/ceph/messenger.c
+2
-2
net/ceph/messenger.c
···
459
459
set_sock_callbacks(sock, con);
460
460
461
461
con_sock_state_connecting(con);
462
-
ret = sock->ops->connect(sock, (struct sockaddr *)&ss, sizeof(ss),
463
-
O_NONBLOCK);
462
+
ret = kernel_connect(sock, (struct sockaddr *)&ss, sizeof(ss),
463
+
O_NONBLOCK);
464
464
if (ret == -EINPROGRESS) {
465
465
dout("connect %s EINPROGRESS sk_state = %u\n",
466
466
ceph_pr_addr(&con->peer_addr),