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

Commit fbcb0b4f authored Aug 30, 2019 by Linus Torvalds

Merge tag 'ceph-for-5.3-rc7' of git://github.com/ceph/ceph-client

Pull two ceph fixes from Ilya Dryomov:
 "A fix for a -rc1 regression in rbd and a trivial static checker fix"

* tag 'ceph-for-5.3-rc7' of git://github.com/ceph/ceph-client:
  rbd: restore zeroing past the overlap when reading from parent
  libceph: don't call crypto_free_sync_skcipher() on a NULL tfm

parents 0d70787b d435c9a7

drivers/block/rbd.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -3038,6 +3038,17 @@ static bool rbd_obj_advance_read(struct rbd_obj_request obj_req, int result)
		}
		return true;
		case RBD_OBJ_READ_PARENT:
		/*
		* The parent image is read only up to the overlap -- zero-fill
		* from the overlap to the end of the request.
		*/
		if (!*result) {
		u32 obj_overlap = rbd_obj_img_extents_bytes(obj_req);

		if (obj_overlap < obj_req->ex.oe_len)
		rbd_obj_zero_range(obj_req, obj_overlap,
		obj_req->ex.oe_len - obj_overlap);
		}
		return true;
		default:
		BUG();

net/ceph/crypto.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -136,10 +136,12 @@ void ceph_crypto_key_destroy(struct ceph_crypto_key *key)
		if (key) {
		kfree(key->key);
		key->key = NULL;
		if (key->tfm) {
		crypto_free_sync_skcipher(key->tfm);
		key->tfm = NULL;
		}
		}
		}

		static const u8 aes_iv = (u8 )CEPH_AES_IV;