Hi all, Today's linux-next merge of the mm-nonmm-unstable tree got a conflict in: kernel/profile.c between commit: 944b8062bc6f6 ("profiling: report it when /proc/profile can't be created") from the vfs-brauner-fixes tree and commit: 091be6dce28ab ("perf/profile: report failure to create /proc/profile") from the mm-nonmm-unstable tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --combined kernel/profile.c index 820d5ec909d40,818098cc094a5..0000000000000 --- a/kernel/profile.c +++ b/kernel/profile.c @@@ -153,28 -153,52 +153,52 @@@ void profile_tick(int type static ssize_t read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos) { - unsigned long p = *ppos; - ssize_t read; - char *pnt; - unsigned int sample_step = (unsigned int)(1UL << prof_shift); + const size_t header_size = sizeof(unsigned int); + const size_t file_size = (prof_len + 1) * sizeof(unsigned int); + unsigned int sample_step; + loff_t offset = *ppos; + size_t pos; + size_t done = 0; + size_t n, not_copied; - if (p >= (prof_len+1)*sizeof(unsigned int)) + /* Keep the shift word-sized before narrowing to the 32-bit ABI. */ + sample_step = (unsigned int)(1UL << prof_shift); + + if (offset < 0) + return -EINVAL; + if (offset >= file_size) return 0; - if (count > (prof_len+1)*sizeof(unsigned int) - p) - count = (prof_len+1)*sizeof(unsigned int) - p; - read = 0; + pos = offset; + count = min(count, file_size - pos); - while (p < sizeof(unsigned int) && count > 0) { - if (put_user(*((char *)(&sample_step)+p), buf)) - return -EFAULT; - buf++; p++; count--; read++; + /* Copy the four-byte sampling resolution. */ + if (pos < header_size) { + n = min(count, header_size - pos); + not_copied = copy_to_user(buf, (u8 *)&sample_step + pos, n); + done += n - not_copied; + if (not_copied) + goto fault; + buf += n; + pos += n; + count -= n; } - pnt = (char *)prof_buffer + p - sizeof(atomic_t); - if (copy_to_user(buf, (void *)pnt, count)) + + /* Copy raw counters using offsets relative to the counter array. */ + if (count) { + not_copied = copy_to_user(buf, + (u8 *)prof_buffer + pos - header_size, + count); + done += count - not_copied; + if (not_copied) + goto fault; + } + *ppos += done; + return done; + fault: + *ppos += done; + if (!done) return -EFAULT; - read += count; - *ppos += read; - return read; + return done; } /* default is to not implement this call */ @@@ -221,8 -245,10 +245,8 @@@ int __ref create_proc_profile(void return 0; entry = proc_create("profile", S_IWUSR | S_IRUGO, NULL, &profile_proc_ops); - if (!entry) { - pr_err("profile: failed to create /proc/profile\n"); + if (!entry) return -ENOMEM; - } proc_set_size(entry, (1 + prof_len) * sizeof(atomic_t)); return 0; }