Include upstream patch that fixes an out-of-bounds read. This can be triggered with mount(8) from util-linux.