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

Commit 9740a6bc authored by Vasily Gorbik's avatar Vasily Gorbik Committed by Greg Kroah-Hartman
Browse files

s390/hypfs: include z/VM guests with access control group set 



commit 663d34c8df98740f1e90241e78e456d00b3c6cad upstream.

Currently if z/VM guest is allowed to retrieve hypervisor performance
data globally for all guests (privilege class B) the query is formed in a
way to include all guests but the group name is left empty. This leads to
that z/VM guests which have access control group set not being included
in the results (even local vm).

Change the query group identifier from empty to "any" to retrieve
information about all guests from any groups (or without a group set).

Cc: stable@vger.kernel.org
Fixes: 31cb4bd3 ("[S390] Hypervisor filesystem (s390_hypfs) for z/VM")
Reviewed-by: default avatarGerald Schaefer <gerald.schaefer@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8819f93c

arch/s390/hypfs/hypfs_vm.c

+4 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


static char local_guest[] = "        ";

static char all_guests[] = "*       ";

static char *all_groups = all_guests;

static char *guest_query;



struct diag2fc_data {
@@ -62,10 +63,11 @@ static int diag2fc(int size, char* query, void *addr) 


	memcpy(parm_list.userid, query, NAME_LEN);

	ASCEBC(parm_list.userid, NAME_LEN);

	memcpy(parm_list.aci_grp, all_groups, NAME_LEN);

	ASCEBC(parm_list.aci_grp, NAME_LEN);

	parm_list.addr = (unsigned long)addr;

	parm_list.size = size;

	parm_list.fmt = 0x02;

	memset(parm_list.aci_grp, 0x40, NAME_LEN);

	rc = -1;



	diag_stat_inc(DIAG_STAT_X2FC);