Commit b4ebdcb9 authored by Alexander Lobakin's avatar Alexander Lobakin Committed by Long Li
Browse files

s390/cio: rename bitmap_size() -> idset_bitmap_size() 

stable inclusion
from stable-v6.6.47
commit 9805a8811781abfdabe63844c48e3c292a490fdd
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAQOJ9
CVE: CVE-2024-45025

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=tags/v6.6.48&id=9805a8811781abfdabe63844c48e3c292a490fdd



--------------------------------

commit c1023f5634b9bfcbfff0dc200245309e3cde9b54 upstream.

bitmap_size() is a pretty generic name and one may want to use it for
a generic bitmap API function. At the same time, its logic is not
"generic", i.e. it's not just `nbits -> size of bitmap in bytes`
converter as it would be expected from its name.
Add the prefix 'idset_' used throughout the file where the function
resides.

Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Acked-by: default avatarPeter Oberparleiter <oberpar@linux.ibm.com>
Signed-off-by: default avatarAlexander Lobakin <aleksander.lobakin@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarLong Li <leo.lilong@huawei.com>
parent 13706c95

drivers/s390/cio/idset.c

+6 −4
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ struct idset { 
	unsigned long bitmap[];

};



static inline unsigned long bitmap_size(int num_ssid, int num_id)

static inline unsigned long idset_bitmap_size(int num_ssid, int num_id)

{

	return BITS_TO_LONGS(num_ssid * num_id) * sizeof(unsigned long);

}
@@ -25,11 +25,12 @@ static struct idset *idset_new(int num_ssid, int num_id) 
{

	struct idset *set;



	set = vmalloc(sizeof(struct idset) + bitmap_size(num_ssid, num_id));

	set = vmalloc(sizeof(struct idset) +

		      idset_bitmap_size(num_ssid, num_id));

	if (set) {

		set->num_ssid = num_ssid;

		set->num_id = num_id;

		memset(set->bitmap, 0, bitmap_size(num_ssid, num_id));

		memset(set->bitmap, 0, idset_bitmap_size(num_ssid, num_id));

	}

	return set;

}
@@ -41,7 +42,8 @@ void idset_free(struct idset *set) 


void idset_fill(struct idset *set)

{

	memset(set->bitmap, 0xff, bitmap_size(set->num_ssid, set->num_id));

	memset(set->bitmap, 0xff,

	       idset_bitmap_size(set->num_ssid, set->num_id));

}



static inline void idset_add(struct idset *set, int ssid, int id)