Skip to content

Commit

Permalink
[S390] vmur: reject open on z/VM reader files with status HOLD
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michael Holzheu authored and Martin Schwidefsky committed Aug 10, 2007
1 parent 278bc68 commit f240559
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion drivers/s390/char/vmur.c
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,9 @@ static int verify_device(struct urdev *urd)
rc = diag_read_next_file_info(&fcb, 0);
if (rc)
return rc;

/* if file is in hold status, we do not read it */
if (fcb.file_stat & (FLG_SYSTEM_HOLD | FLG_USER_HOLD))
return -EPERM;
/* open file on virtual reader */
buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
if (!buf)
Expand Down
4 changes: 3 additions & 1 deletion drivers/s390/char/vmur.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ struct file_control_block {
char rest[200];
} __attribute__ ((packed));

#define FLG_CP_DUMP 0x10
#define FLG_SYSTEM_HOLD 0x04
#define FLG_CP_DUMP 0x10
#define FLG_USER_HOLD 0x20

/*
* A struct urdev is created for each ur device that is made available
Expand Down

0 comments on commit f240559

Please sign in to comment.