Commit e859d375 authored by Wojtek Wasko's avatar Wojtek Wasko Committed by David S. Miller
Browse files

posix-clock: Store file pointer in struct posix_clock_context 



File descriptor based pc_clock_*() operations of dynamic posix clocks
have access to the file pointer and implement permission checks in the
generic code before invoking the relevant dynamic clock callback.

Character device operations (open, read, poll, ioctl) do not implement a
generic permission control and the dynamic clock callbacks have no
access to the file pointer to implement them.

Extend struct posix_clock_context with a struct file pointer and
initialize it in posix_clock_open(), so that all dynamic clock callbacks
can access it.

Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
Reviewed-by: default avatarVadim Fedorenko <vadim.fedorenko@linux.dev>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarWojtek Wasko <wwasko@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f252f23a

include/linux/posix-clock.h

+5 −1
Original line number Diff line number Diff line
@@ -95,10 +95,13 @@ struct posix_clock { 
 * struct posix_clock_context - represents clock file operations context

 *

 * @clk:              Pointer to the clock

 * @fp:               Pointer to the file used to open the clock

 * @private_clkdata:  Pointer to user data

 *

 * Drivers should use struct posix_clock_context during specific character

 * device file operation methods to access the posix clock.

 * device file operation methods to access the posix clock. In particular,

 * the file pointer can be used to verify correct access mode for ioctl()

 * calls.

 *

 * Drivers can store a private data structure during the open operation

 * if they have specific information that is required in other file
@@ -106,6 +109,7 @@ struct posix_clock { 
 */

struct posix_clock_context {

	struct posix_clock *clk;

	struct file *fp;

	void *private_clkdata;

};

kernel/time/posix-clock.c

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ static int posix_clock_open(struct inode *inode, struct file *fp) 
		goto out;

	}

	pccontext->clk = clk;

	pccontext->fp = fp;

	if (clk->ops.open) {

		err = clk->ops.open(pccontext, fp->f_mode);

		if (err) {