Merge pull request #1150 from tom-daubney-arm/backport_mac_buffer_protection

[Backport] - MAC buffer protection