aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Holzheu <holzheu@de.ibm.com>2007-08-10 08:32:32 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2007-08-10 08:32:37 -0400
commitf2405598e0678e9c93dd780f2a12fc562ece3d13 (patch)
tree436b83be63f88e567e6769b8cdec37bcdce020f2
parent278bc68c4bfcd1af97972f5c4458acf3b9b19c37 (diff)
[S390] vmur: reject open on z/VM reader files with status HOLD
If a reader file with HOLD status is at the top of the reader queue, currently all read requests will return data of the second file in the queue. But the semantics of vmur is that always the topmost file is read. With this fix -EPERM is returned on open, if the topmost reader file is in HOLD status. Signed-off-by: Michael Holzheu <holzheu@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--drivers/s390/char/vmur.c4
-rw-r--r--drivers/s390/char/vmur.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c
index 27b8bf927415..04395c0f99d8 100644
--- a/drivers/s390/char/vmur.c
+++ b/drivers/s390/char/vmur.c
@@ -556,7 +556,9 @@ static int verify_device(struct urdev *urd)
556 rc = diag_read_next_file_info(&fcb, 0); 556 rc = diag_read_next_file_info(&fcb, 0);
557 if (rc) 557 if (rc)
558 return rc; 558 return rc;
559 559 /* if file is in hold status, we do not read it */
560 if (fcb.file_stat & (FLG_SYSTEM_HOLD | FLG_USER_HOLD))
561 return -EPERM;
560 /* open file on virtual reader */ 562 /* open file on virtual reader */
561 buf = kmalloc(PAGE_SIZE, GFP_KERNEL); 563 buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
562 if (!buf) 564 if (!buf)
diff --git a/drivers/s390/char/vmur.h b/drivers/s390/char/vmur.h
index 16d0a4e38e40..522a9dfaa275 100644
--- a/drivers/s390/char/vmur.h
+++ b/drivers/s390/char/vmur.h
@@ -50,7 +50,9 @@ struct file_control_block {
50 char rest[200]; 50 char rest[200];
51} __attribute__ ((packed)); 51} __attribute__ ((packed));
52 52
53#define FLG_CP_DUMP 0x10 53#define FLG_SYSTEM_HOLD 0x04
54#define FLG_CP_DUMP 0x10
55#define FLG_USER_HOLD 0x20
54 56
55/* 57/*
56 * A struct urdev is created for each ur device that is made available 58 * A struct urdev is created for each ur device that is made available