Commit 4c4f0c2b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ceph-for-5.15-rc3' of git://github.com/ceph/ceph-client 

Pull ceph fix from Ilya Dryomov:
 "A fix for a potential array out of bounds access from Dan"

* tag 'ceph-for-5.15-rc3' of git://github.com/ceph/ceph-client:
  ceph: fix off by one bugs in unsafe_request_wait()
parents e655c81a 708c8716

fs/ceph/caps.c

+2 −2
Original line number Diff line number Diff line
@@ -2263,7 +2263,7 @@ static int unsafe_request_wait(struct inode *inode) 
			list_for_each_entry(req, &ci->i_unsafe_dirops,

					    r_unsafe_dir_item) {

				s = req->r_session;

				if (unlikely(s->s_mds > max)) {

				if (unlikely(s->s_mds >= max)) {

					spin_unlock(&ci->i_unsafe_lock);

					goto retry;

				}
@@ -2277,7 +2277,7 @@ static int unsafe_request_wait(struct inode *inode) 
			list_for_each_entry(req, &ci->i_unsafe_iops,

					    r_unsafe_target_item) {

				s = req->r_session;

				if (unlikely(s->s_mds > max)) {

				if (unlikely(s->s_mds >= max)) {

					spin_unlock(&ci->i_unsafe_lock);

					goto retry;

				}