Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

torvalds · torvalds · commit e365806ac289 · 2017-09-25T18:24:14.000-07:00
Pull compat fix from Al Viro:
 "I really wish gcc warned about conversions from pointer to function
  into void *..."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix a typo in put_compat_shm_info()
diff --git a/ipc/shm.c b/ipc/shm.c
@@ -1154,7 +1154,7 @@ static int put_compat_shm_info(struct shm_info *ip,
 	info.shm_swp = ip->shm_swp;
 	info.swap_attempts = ip->swap_attempts;
 	info.swap_successes = ip->swap_successes;
-	return copy_to_user(up, &info, sizeof(info));
+	return copy_to_user(uip, &info, sizeof(info));
 }
 
 static int copy_compat_shmid_to_user(void __user *buf, struct shmid64_ds *in,

Original file line number	Diff line number	Diff line change
`@@ -1154,7 +1154,7 @@ static int put_compat_shm_info(struct shm_info *ip,`
`1154`	`1154`	`info.shm_swp = ip->shm_swp;`
`1155`	`1155`	`info.swap_attempts = ip->swap_attempts;`
`1156`	`1156`	`info.swap_successes = ip->swap_successes;`
`1157`		`- return copy_to_user(up, &info, sizeof(info));`
	`1157`	`+ return copy_to_user(uip, &info, sizeof(info));`
`1158`	`1158`	`}`
`1159`	`1159`
`1160`	`1160`	`static int copy_compat_shmid_to_user(void __user buf, struct shmid64_ds in,`