Commit 1c383726 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.sysctl' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull sysctl fixes from Al Viro:
 "Fixups to regressions in sysctl series"

* 'work.sysctl' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  sysctl: reject gigantic reads/write to sysctl files
  cdrom: fix an incorrect __user annotation on cdrom_sysctl_info
  trace: fix an incorrect __user annotation on stack_trace_sysctl
  random: fix an incorrect __user annotation on proc_do_entropy
  net/sysctl: remove leftover __user annotations on neigh_proc_dointvec*
  net/sysctl: use cpumask_parse in flow_limit_cpu_sysctl
parents 3a8557e1 ef9d965b

drivers/cdrom/cdrom.c

+1 −1
Original line number Diff line number Diff line
@@ -3535,7 +3535,7 @@ static int cdrom_print_info(const char *header, int val, char *info, 
}



static int cdrom_sysctl_info(struct ctl_table *ctl, int write,

                           void __user *buffer, size_t *lenp, loff_t *ppos)

                           void *buffer, size_t *lenp, loff_t *ppos)

{

	int pos;

	char *info = cdrom_sysctl_settings.info;

drivers/char/random.c

+1 −1
Original line number Diff line number Diff line
@@ -2087,7 +2087,7 @@ static int proc_do_uuid(struct ctl_table *table, int write, 
 * Return entropy available scaled to integral bits

 */

static int proc_do_entropy(struct ctl_table *table, int write,

			   void __user *buffer, size_t *lenp, loff_t *ppos)

			   void *buffer, size_t *lenp, loff_t *ppos)

{

	struct ctl_table fake_table;

	int entropy_count;

fs/proc/proc_sysctl.c

+4 −0
Original line number Diff line number Diff line
@@ -565,6 +565,10 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *ubuf, 
	if (!table->proc_handler)

		goto out;



	/* don't even try if the size is too large */

	if (count > KMALLOC_MAX_SIZE)

		return -ENOMEM;



	if (write) {

		kbuf = memdup_user_nul(ubuf, count);

		if (IS_ERR(kbuf)) {

include/linux/ftrace.h

+2 −3
Original line number Diff line number Diff line
@@ -342,9 +342,8 @@ static inline void arch_ftrace_set_direct_caller(struct pt_regs *regs, 


extern int stack_tracer_enabled;



int stack_trace_sysctl(struct ctl_table *table, int write,

		       void __user *buffer, size_t *lenp,

		       loff_t *ppos);

int stack_trace_sysctl(struct ctl_table *table, int write, void *buffer,

		       size_t *lenp, loff_t *ppos);



/* DO NOT MODIFY THIS VARIABLE DIRECTLY! */

DECLARE_PER_CPU(int, disable_stack_tracer);

include/net/neighbour.h

+3 −4
Original line number Diff line number Diff line
@@ -392,13 +392,12 @@ void *neigh_seq_next(struct seq_file *, void *, loff_t *); 
void neigh_seq_stop(struct seq_file *, void *);



int neigh_proc_dointvec(struct ctl_table *ctl, int write,

			void __user *buffer, size_t *lenp, loff_t *ppos);

			void *buffer, size_t *lenp, loff_t *ppos);

int neigh_proc_dointvec_jiffies(struct ctl_table *ctl, int write,

				void __user *buffer,

				void *buffer,

				size_t *lenp, loff_t *ppos);

int neigh_proc_dointvec_ms_jiffies(struct ctl_table *ctl, int write,

				   void __user *buffer,

				   size_t *lenp, loff_t *ppos);

				   void *buffer, size_t *lenp, loff_t *ppos);



int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p,

			  proc_handler *proc_handler);

CRA Git | Maintained and supported by SUSTech CRA and CCSE