| commit | 33b6de4b94e018b3cb621db5eabcb3a4f18bdd3d | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Sat Feb 07 07:38:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Feb 07 07:38:37 2015 +0000 |
| tree | 4ae148ff932ef9d38661d14f34b9bc3dfcae7fc4 | |
| parent | d773fc118a30d3273888391ebf9f0ea5a916cd75 [diff] | |
| parent | d55d8dac45dc60cb2cc9e599d3e89532db0cfc39 [diff] |
am d55d8dac: Merge "prevent ioctl_init() to write outside buffer" * commit 'd55d8dac45dc60cb2cc9e599d3e89532db0cfc39': prevent ioctl_init() to write outside buffer
diff --git a/cryptfs.c b/cryptfs.c index 6f860e4..58bb066 100644 --- a/cryptfs.c +++ b/cryptfs.c
@@ -333,7 +333,7 @@ io->version[2] = 0; io->flags = flags; if (name) { - strncpy(io->name, name, sizeof(io->name)); + strlcpy(io->name, name, sizeof(io->name)); } }