USB: ftdi_sio: fix null deref at port probe

[firefly-linux-kernel-4.4.55.git] / fs / seq_file.c

diff --git a/fs/seq_file.c b/fs/seq_file.c
index 38bb59f3f2add2aad3ad19af5086f00911ce2f66..3dd44db1465e9a55c7e7eb9cb0c39e5a6bc429ff 100644 (file)
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -328,6 +328,8 @@ loff_t seq_lseek(struct file *file, loff_t offset, int whence)
                                m->read_pos = offset;
                                retval = file->f_pos = offset;
                        }
+               } else {
+                       file->f_pos = offset;
                }
        }
        file->f_version = m->version;
@@ -599,6 +601,24 @@ int single_open(struct file *file, int (*show)(struct seq_file *, void *),
 }
 EXPORT_SYMBOL(single_open);
 
+int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
+               void *data, size_t size)
+{
+       char *buf = kmalloc(size, GFP_KERNEL);
+       int ret;
+       if (!buf)
+               return -ENOMEM;
+       ret = single_open(file, show, data);
+       if (ret) {
+               kfree(buf);
+               return ret;
+       }
+       ((struct seq_file *)file->private_data)->buf = buf;
+       ((struct seq_file *)file->private_data)->size = size;
+       return 0;
+}
+EXPORT_SYMBOL(single_open_size);
+
 int single_release(struct inode *inode, struct file *file)
 {
        const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;