am 33b6de4b: am d55d8dac: Merge "prevent ioctl_init() to write outside buffer"

* commit '33b6de4b94e018b3cb621db5eabcb3a4f18bdd3d':
  prevent ioctl_init() to write outside buffer