On 5/21/2017 7:13 PM, James Morris wrote:
> On Fri, 19 May 2017, Dan Jurgens wrote:
>
>> security/security.c | 385 ++++++++++++++++++++++
> This looks wrong -- merge problem?
Yes, it was a merge problem. I added back the per field initialization of the security head hooks. Paul stripped this (and the same problem in patch 0004) himself before merging.
>
>
>> + if (pps->alt.state != IB_PORT_PKEY_NOT_VALID) {
>> + get_pkey_and_subnet_prefix(&pps->alt,
>> + &pkey,
>> + &subnet_prefix);
>> +
>> + ret = enforce_qp_pkey_security(pkey,
>> + subnet_prefix,
>> + sec);
>> + }
>> +
>> + if (ret)
>> + goto out;
> The above if/goto is unnecessary.
Right.
Paul, do you want me to fix this with a new patch?
>
>> +
>> +out:
>> + return ret;
>> +}
>
>
