Commit 7cc2a8ea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-5.8-2020-07-01' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:

 - Use kvfree_sensitive() for the block keyslot free (Eric)

 - Sync blk-mq debugfs flags (Hou)

 - Memory leak fix in virtio-blk error path (Hou)

* tag 'block-5.8-2020-07-01' of git://git.kernel.dk/linux-block:
  virtio-blk: free vblk-vqs in error path of virtblk_probe()
  block/keyslot-manager: use kvfree_sensitive()
  blk-mq-debugfs: update blk_queue_flag_name[] accordingly for new flags
parents c93493b7 e7eea44e

block/blk-mq-debugfs.c

+3 −0
Original line number Diff line number Diff line
@@ -125,6 +125,9 @@ static const char *const blk_queue_flag_name[] = { 
	QUEUE_FLAG_NAME(REGISTERED),

	QUEUE_FLAG_NAME(SCSI_PASSTHROUGH),

	QUEUE_FLAG_NAME(QUIESCED),

	QUEUE_FLAG_NAME(PCI_P2PDMA),

	QUEUE_FLAG_NAME(ZONE_RESETALL),

	QUEUE_FLAG_NAME(RQ_ALLOC_TIME),

};

#undef QUEUE_FLAG_NAME

block/keyslot-manager.c

+1 −2
Original line number Diff line number Diff line
@@ -374,8 +374,7 @@ void blk_ksm_destroy(struct blk_keyslot_manager *ksm) 
	if (!ksm)

		return;

	kvfree(ksm->slot_hashtable);

	memzero_explicit(ksm->slots, sizeof(ksm->slots[0]) * ksm->num_slots);

	kvfree(ksm->slots);

	kvfree_sensitive(ksm->slots, sizeof(ksm->slots[0]) * ksm->num_slots);

	memzero_explicit(ksm, sizeof(*ksm));

}

EXPORT_SYMBOL_GPL(blk_ksm_destroy);

drivers/block/virtio_blk.c

+1 −0
Original line number Diff line number Diff line
@@ -878,6 +878,7 @@ out_put_disk: 
	put_disk(vblk->disk);

out_free_vq:

	vdev->config->del_vqs(vdev);

	kfree(vblk->vqs);

out_free_vblk:

	kfree(vblk);

out_free_index:

include/linux/blkdev.h

+1 −0
Original line number Diff line number Diff line
@@ -590,6 +590,7 @@ struct request_queue { 
	u64			write_hints[BLK_MAX_WRITE_HINTS];

};



/* Keep blk_queue_flag_name[] in sync with the definitions below */

#define QUEUE_FLAG_STOPPED	0	/* queue is stopped */

#define QUEUE_FLAG_DYING	1	/* queue being torn down */

#define QUEUE_FLAG_NOMERGES     3	/* disable merge attempts */

CRA Git | Maintained and supported by SUSTech CRA and CCSE