[Notes] [Git][BuildStream/buildstream][bst-1.2] 2 commits: Keep original flags for create in SafeHardlinks.

[Valentin David <gitlab mg gitlab com>]

Title: GitLab

Valentin David pushed to branch bst-1.2 at BuildStream / buildstream

Commits:

• 928c4d99
  by Valentin David at 2018-08-09T12:51:48Z

  Keep original flags for create in SafeHardlinks.
  
  When open(2) is used with flags O_CREAT|O_RDWR, the file descriptor
  must be readable. Unfortunately O_RDWR was not passed which made
  read fail with EBADF and mmap to signal SIGBUS.
  
  This issue happened with man-db for example.
  
  Fixes #143.
  

• f5683244
  by Valentin David at 2018-08-09T13:49:03Z

  Merge branch 'valentindavid/fuse-create-flags-1.2' into 'bst-1.2'
  
  Keep original flags for create in SafeHardlinks.
  
  See merge request BuildStream/buildstream!625

2 changed files:

• buildstream/_fuse/fuse.py
• buildstream/_fuse/hardlinks.py

Changes:

buildstream/_fuse/fuse.py

---

...	...	@@ -757,7 +757,11 @@ class FUSE(object):
757	757	if self.raw_fi:
758	758	return self.operations('create', path, mode, fi)
759	759	else:
760		- fi.fh = self.operations('create', path, mode)
	760	+ # This line is different from upstream to fix issues
	761	+ # reading file opened with O_CREAT|O_RDWR.
	762	+ # See issue #143.
	763	+ fi.fh = self.operations('create', path, mode, fi.flags)
	764	+ # END OF MODIFICATION
761	765	return 0
762	766
763	767	def ftruncate(self, path, length, fip):

buildstream/_fuse/hardlinks.py

---

...	...	@@ -185,12 +185,12 @@ class SafeHardlinkOps(Operations):
185	185
186	186	return os.open(full_path, flags)
187	187
188		- def create(self, path, mode, fi=None):
	188	+ def create(self, path, mode, flags):
189	189	full_path = self._full_path(path)
190	190
191	191	# If it already exists, ensure it's a copy first
192	192	self._ensure_copy(full_path)
193		- return os.open(full_path, os.O_WRONLY | os.O_CREAT, mode)
	193	+ return os.open(full_path, flags, mode)
194	194
195	195	def read(self, path, length, offset, fh):
196	196	os.lseek(fh, offset, os.SEEK_SET)

—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.