diff for duplicates of <4bbd2e38cf388629e50a9c1eb35a458786afa858.camel@hammerspace.com> diff --git a/a/1.txt b/N1/1.txt index 7eb7684..7dac3d5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,17 +1,32 @@ -T24gRnJpLCAyMDE4LTEwLTE5IGF0IDExOjI5IC0wNDAwLCBPbGdhIEtvcm5pZXZza2FpYSB3cm90 -ZToNCj4gRnJvbTogQW5uYSBTY2h1bWFrZXIgPEFubmEuU2NodW1ha2VyQE5ldGFwcC5jb20+DQo+ -IA0KPiBTaWduZWQtb2ZmLWJ5OiBBbm5hIFNjaHVtYWtlciA8QW5uYS5TY2h1bWFrZXJATmV0YXBw -LmNvbT4NCj4gLS0tDQo+ICBmcy9yZWFkX3dyaXRlLmMgfCAzICsrKw0KPiAgMSBmaWxlIGNoYW5n -ZWQsIDMgaW5zZXJ0aW9ucygrKQ0KPiANCj4gZGlmZiAtLWdpdCBhL2ZzL3JlYWRfd3JpdGUuYyBi -L2ZzL3JlYWRfd3JpdGUuYw0KPiBpbmRleCAzOWI0YTIxLi5jNjA3OTBmIDEwMDY0NA0KPiAtLS0g -YS9mcy9yZWFkX3dyaXRlLmMNCj4gKysrIGIvZnMvcmVhZF93cml0ZS5jDQo+IEBAIC0xNTcwLDYg -KzE1NzAsOSBAQCBzc2l6ZV90IHZmc19jb3B5X2ZpbGVfcmFuZ2Uoc3RydWN0IGZpbGUNCj4gKmZp -bGVfaW4sIGxvZmZfdCBwb3NfaW4sDQo+ICAJaWYgKHVubGlrZWx5KHJldCkpDQo+ICAJCXJldHVy -biByZXQ7DQo+ICANCj4gKwlpZiAocG9zX2luID49IGlfc2l6ZV9yZWFkKGlub2RlX2luKSkNCj4g -KwkJcmV0dXJuIC1FSU5WQUw7DQo+ICsNCj4gIAlpZiAoIShmaWxlX2luLT5mX21vZGUgJiBGTU9E -RV9SRUFEKSB8fA0KPiAgCSAgICAhKGZpbGVfb3V0LT5mX21vZGUgJiBGTU9ERV9XUklURSkgfHwN -Cj4gIAkgICAgKGZpbGVfb3V0LT5mX2ZsYWdzICYgT19BUFBFTkQpKQ0KDQpUaGlzIHBhdGNoIHJl -cXVpcmVzIGFuIEFDSyBmcm9tIHRoZSBWRlMgbWFpbnRhaW5lcnMgaWYgSSdtIHRvIHB1c2ggaXQN -CnVwc3RyZWFtLg0KQ2M6IEFsIGFuZCBMaW51eC1mc2RldmVsLg0KDQotLSANClRyb25kIE15a2xl -YnVzdA0KTGludXggTkZTIGNsaWVudCBtYWludGFpbmVyLCBIYW1tZXJzcGFjZQ0KdHJvbmQubXlr -bGVidXN0QGhhbW1lcnNwYWNlLmNvbQ0KDQoNCg== +On Fri, 2018-10-19 at 11:29 -0400, Olga Kornievskaia wrote: +> From: Anna Schumaker <Anna.Schumaker@Netapp.com> +> +> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com> +> --- +> fs/read_write.c | 3 +++ +> 1 file changed, 3 insertions(+) +> +> diff --git a/fs/read_write.c b/fs/read_write.c +> index 39b4a21..c60790f 100644 +> --- a/fs/read_write.c +> +++ b/fs/read_write.c +> @@ -1570,6 +1570,9 @@ ssize_t vfs_copy_file_range(struct file +> *file_in, loff_t pos_in, +> if (unlikely(ret)) +> return ret; +> +> + if (pos_in >= i_size_read(inode_in)) +> + return -EINVAL; +> + +> if (!(file_in->f_mode & FMODE_READ) || +> !(file_out->f_mode & FMODE_WRITE) || +> (file_out->f_flags & O_APPEND)) + +This patch requires an ACK from the VFS maintainers if I'm to push it +upstream. +Cc: Al and Linux-fsdevel. + +-- +Trond Myklebust +Linux NFS client maintainer, Hammerspace +trond.myklebust@hammerspace.com diff --git a/a/content_digest b/N1/content_digest index fa9fbde..08f83e8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -10,22 +10,37 @@ " linux-fsdevel@vger.kernel.org <linux-fsdevel@vger.kernel.org>\0" "\00:1\0" "b\0" - "T24gRnJpLCAyMDE4LTEwLTE5IGF0IDExOjI5IC0wNDAwLCBPbGdhIEtvcm5pZXZza2FpYSB3cm90\n" - "ZToNCj4gRnJvbTogQW5uYSBTY2h1bWFrZXIgPEFubmEuU2NodW1ha2VyQE5ldGFwcC5jb20+DQo+\n" - "IA0KPiBTaWduZWQtb2ZmLWJ5OiBBbm5hIFNjaHVtYWtlciA8QW5uYS5TY2h1bWFrZXJATmV0YXBw\n" - "LmNvbT4NCj4gLS0tDQo+ICBmcy9yZWFkX3dyaXRlLmMgfCAzICsrKw0KPiAgMSBmaWxlIGNoYW5n\n" - "ZWQsIDMgaW5zZXJ0aW9ucygrKQ0KPiANCj4gZGlmZiAtLWdpdCBhL2ZzL3JlYWRfd3JpdGUuYyBi\n" - "L2ZzL3JlYWRfd3JpdGUuYw0KPiBpbmRleCAzOWI0YTIxLi5jNjA3OTBmIDEwMDY0NA0KPiAtLS0g\n" - "YS9mcy9yZWFkX3dyaXRlLmMNCj4gKysrIGIvZnMvcmVhZF93cml0ZS5jDQo+IEBAIC0xNTcwLDYg\n" - "KzE1NzAsOSBAQCBzc2l6ZV90IHZmc19jb3B5X2ZpbGVfcmFuZ2Uoc3RydWN0IGZpbGUNCj4gKmZp\n" - "bGVfaW4sIGxvZmZfdCBwb3NfaW4sDQo+ICAJaWYgKHVubGlrZWx5KHJldCkpDQo+ICAJCXJldHVy\n" - "biByZXQ7DQo+ICANCj4gKwlpZiAocG9zX2luID49IGlfc2l6ZV9yZWFkKGlub2RlX2luKSkNCj4g\n" - "KwkJcmV0dXJuIC1FSU5WQUw7DQo+ICsNCj4gIAlpZiAoIShmaWxlX2luLT5mX21vZGUgJiBGTU9E\n" - "RV9SRUFEKSB8fA0KPiAgCSAgICAhKGZpbGVfb3V0LT5mX21vZGUgJiBGTU9ERV9XUklURSkgfHwN\n" - "Cj4gIAkgICAgKGZpbGVfb3V0LT5mX2ZsYWdzICYgT19BUFBFTkQpKQ0KDQpUaGlzIHBhdGNoIHJl\n" - "cXVpcmVzIGFuIEFDSyBmcm9tIHRoZSBWRlMgbWFpbnRhaW5lcnMgaWYgSSdtIHRvIHB1c2ggaXQN\n" - "CnVwc3RyZWFtLg0KQ2M6IEFsIGFuZCBMaW51eC1mc2RldmVsLg0KDQotLSANClRyb25kIE15a2xl\n" - "YnVzdA0KTGludXggTkZTIGNsaWVudCBtYWludGFpbmVyLCBIYW1tZXJzcGFjZQ0KdHJvbmQubXlr\n" - bGVidXN0QGhhbW1lcnNwYWNlLmNvbQ0KDQoNCg== + "On Fri, 2018-10-19 at 11:29 -0400, Olga Kornievskaia wrote:\n" + "> From: Anna Schumaker <Anna.Schumaker@Netapp.com>\n" + "> \n" + "> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>\n" + "> ---\n" + "> fs/read_write.c | 3 +++\n" + "> 1 file changed, 3 insertions(+)\n" + "> \n" + "> diff --git a/fs/read_write.c b/fs/read_write.c\n" + "> index 39b4a21..c60790f 100644\n" + "> --- a/fs/read_write.c\n" + "> +++ b/fs/read_write.c\n" + "> @@ -1570,6 +1570,9 @@ ssize_t vfs_copy_file_range(struct file\n" + "> *file_in, loff_t pos_in,\n" + "> \tif (unlikely(ret))\n" + "> \t\treturn ret;\n" + "> \n" + "> +\tif (pos_in >= i_size_read(inode_in))\n" + "> +\t\treturn -EINVAL;\n" + "> +\n" + "> \tif (!(file_in->f_mode & FMODE_READ) ||\n" + "> \t !(file_out->f_mode & FMODE_WRITE) ||\n" + "> \t (file_out->f_flags & O_APPEND))\n" + "\n" + "This patch requires an ACK from the VFS maintainers if I'm to push it\n" + "upstream.\n" + "Cc: Al and Linux-fsdevel.\n" + "\n" + "-- \n" + "Trond Myklebust\n" + "Linux NFS client maintainer, Hammerspace\n" + trond.myklebust@hammerspace.com -ada66c0bf97c5d7d199663a7f3d4e6d42e805c17eba83a6dc1237634c5bffe2e +cf47db5b3fc89a56f35f4489d9a2ad3682577fc6e5c9276de885a70245d44b05
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox