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

torvalds · torvalds · commit 115a54162a6c · 2020-05-19T16:33:26.000-07:00
Pull vfs fix from Al Viro:
 "Stable fodder fix: copy_fdtable() would get screwed on 64bit boxen
  with sysctl_nr_open raised to 512M or higher, which became possible
  since 2.6.25.

  Nobody sane would set the things up that way, but..."

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix multiplication overflow in copy_fdtable()
diff --git a/fs/file.c b/fs/file.c
@@ -70,7 +70,7 @@ static void copy_fd_bitmaps(struct fdtable *nfdt, struct fdtable *ofdt,
  */
 static void copy_fdtable(struct fdtable *nfdt, struct fdtable *ofdt)
 {
-	unsigned int cpy, set;
+	size_t cpy, set;
 
 	BUG_ON(nfdt->max_fds < ofdt->max_fds);
 

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ static void copy_fd_bitmaps(struct fdtable nfdt, struct fdtable ofdt,`
`70`	`70`	`*/`
`71`	`71`	`static void copy_fdtable(struct fdtable nfdt, struct fdtable ofdt)`
`72`	`72`	`{`
`73`		`- unsigned int cpy, set;`
	`73`	`+ size_t cpy, set;`
`74`	`74`
`75`	`75`	`BUG_ON(nfdt->max_fds < ofdt->max_fds);`
`76`	`76`