Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22a89a6b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ceph-for-5.0-rc4' of git://github.com/ceph/ceph-client 

Pull ceph fixes from Ilya Dryomov:
 "A fix for a potential use-after-free, a patch to close a (mostly
  benign) race in the messenger and a licence clarification for quota.c"

* tag 'ceph-for-5.0-rc4' of git://github.com/ceph/ceph-client:
  ceph: quota: cleanup license mess
  libceph: avoid KEEPALIVE_PENDING races in ceph_con_keepalive()
  ceph: clear inode pointer when snap realm gets dropped by its inode
parents aa7b9845 74827ee2

fs/ceph/caps.c

+2 −0
Original line number Diff line number Diff line
@@ -1035,6 +1035,8 @@ static void drop_inode_snap_realm(struct ceph_inode_info *ci) 
	list_del_init(&ci->i_snap_realm_item);

	ci->i_snap_realm_counter++;

	ci->i_snap_realm = NULL;

	if (realm->ino == ci->i_vino.ino)

		realm->inode = NULL;

	spin_unlock(&realm->inodes_with_caps_lock);

	ceph_put_snap_realm(ceph_sb_to_client(ci->vfs_inode.i_sb)->mdsc,

			    realm);

fs/ceph/quota.c

+0 −13
Original line number Diff line number Diff line
@@ -3,19 +3,6 @@ 
 * quota.c - CephFS quota

 *

 * Copyright (C) 2017-2018 SUSE

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version 2

 * of the License, or (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, see <http://www.gnu.org/licenses/>.

 */



#include <linux/statfs.h>

net/ceph/messenger.c

+3 −2
Original line number Diff line number Diff line
@@ -3206,9 +3206,10 @@ void ceph_con_keepalive(struct ceph_connection *con) 
	dout("con_keepalive %p\n", con);

	mutex_lock(&con->mutex);

	clear_standby(con);

	con_flag_set(con, CON_FLAG_KEEPALIVE_PENDING);

	mutex_unlock(&con->mutex);

	if (con_flag_test_and_set(con, CON_FLAG_KEEPALIVE_PENDING) == 0 &&

	    con_flag_test_and_set(con, CON_FLAG_WRITE_PENDING) == 0)



	if (con_flag_test_and_set(con, CON_FLAG_WRITE_PENDING) == 0)

		queue_con(con);

}

EXPORT_SYMBOL(ceph_con_keepalive);