xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag '9p-for-5.10-rc1' of git://github.com/martinetd/linux

Browse Source 
Pull 9p updates from Dominique Martinet:
 "A couple of small fixes (loff_t overflow on 32bit, syzbot
  uninitialized variable warning) and code cleanup (xen)"

* tag '9p-for-5.10-rc1' of git://github.com/martinetd/linux:
  net: 9p: initialize sun_server.sun_path to have addr's value only when addr is valid
  9p/xen: Fix format argument warning
  9P: Cast to loff_t before multiplying
This commit is contained in:
Linus Torvalds
2020-10-22 09:33:20 -07:00
parent f804b31594 7ca1db21ef
commit 334d431f65
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/9p/vfs_file.c
View File

@@ -612,9 +612,9 @@ static void v9fs_mmap_vm_close(struct vm_area_struct *vma)
struct writeback_control wbc = { struct writeback_control wbc = {
.nr_to_write = LONG_MAX, .nr_to_write = LONG_MAX,
.sync_mode = WB_SYNC_ALL, .sync_mode = WB_SYNC_ALL,
.range_start = vma->vm_pgoff * PAGE_SIZE, .range_start = (loff_t)vma->vm_pgoff * PAGE_SIZE,
/* absolute end, byte at end included */ /* absolute end, byte at end included */
.range_end = vma->vm_pgoff * PAGE_SIZE + .range_end = (loff_t)vma->vm_pgoff * PAGE_SIZE +
(vma->vm_end - vma->vm_start - 1), (vma->vm_end - vma->vm_start - 1),
}; };

2
net/9p/trans_fd.c
View File

@@ -1023,7 +1023,7 @@ p9_fd_create_unix(struct p9_client *client, const char *addr, char *args)
csocket = NULL; csocket = NULL;
if (addr == NULL) if (!addr || !strlen(addr))
return -EINVAL; return -EINVAL;
if (strlen(addr) >= UNIX_PATH_MAX) { if (strlen(addr) >= UNIX_PATH_MAX) {

4
net/9p/trans_xen.c
View File

@@ -451,13 +451,13 @@ static int xen_9pfs_front_probe(struct xenbus_device *dev,
char str[16]; char str[16];
BUILD_BUG_ON(XEN_9PFS_NUM_RINGS > 9); BUILD_BUG_ON(XEN_9PFS_NUM_RINGS > 9);
sprintf(str, "ring-ref%u", i); sprintf(str, "ring-ref%d", i);
ret = xenbus_printf(xbt, dev->nodename, str, "%d", ret = xenbus_printf(xbt, dev->nodename, str, "%d",
priv->rings[i].ref); priv->rings[i].ref);
if (ret) if (ret)
goto error_xenbus; goto error_xenbus;
sprintf(str, "event-channel-%u", i); sprintf(str, "event-channel-%d", i);
ret = xenbus_printf(xbt, dev->nodename, str, "%u", ret = xenbus_printf(xbt, dev->nodename, str, "%u",
priv->rings[i].evtchn); priv->rings[i].evtchn);
if (ret) if (ret)