Merge branch 'fixes for bpf_prog_pack'

Song Liu says:

====================

Changes v1 => v2:
1. Rephrase comments in 2/2. (Yonghong)

Two fixes for bpf_prog_pack.
====================

Signed-off-by: Alexei Starovoitov <ast@kernel.org>