Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8;
Date:   Sun, 17 Sep 2023 19:00:58 -0700
From:   Kees Cook <kees@kernel.org>
To:     Xiubo Li <xiubli@redhat.com>, Kees Cook <keescook@chromium.org>,
        Ilya Dryomov <idryomov@gmail.com>
CC:     Jeff Layton <jlayton@kernel.org>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, ceph-devel@vger.kernel.org,
        netdev@vger.kernel.org, Nathan Chancellor <nathan@kernel.org>,
        Nick Desaulniers <ndesaulniers@google.com>,
        Tom Rix <trix@redhat.com>, linux-kernel@vger.kernel.org,
        llvm@lists.linux.dev, linux-hardening@vger.kernel.org
Subject: Re: [PATCH] ceph: Annotate struct ceph_monmap with __counted_by
User-Agent: K-9 Mail for Android
In-Reply-To: <3c4c7ca8-e1a2-fbb1-bda4-b7000eb9a8d9@redhat.com>
References: <20230915201510.never.365-kees@kernel.org> <3c4c7ca8-e1a2-fbb1-bda4-b7000eb9a8d9@redhat.com>
Message-ID: <6122C479-ADD9-43A8-8EB6-CF518F97F64C@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain;
 charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On September 17, 2023 5:25:10 PM PDT, Xiubo Li <xiubli@redhat=2Ecom> wrote:
>
>On 9/16/23 04:15, Kees Cook wrote:
> > [=2E=2E=2E]
>> Additionally, since the element count member must be set before accessi=
ng
>> the annotated flexible array member, move its initialization earlier=2E
>>=20
>> [=2E=2E=2E]
>> diff --git a/net/ceph/mon_client=2Ec b/net/ceph/mon_client=2Ec
>> index faabad6603db=2E=2Ef263f7e91a21 100644
>> --- a/net/ceph/mon_client=2Ec
>> +++ b/net/ceph/mon_client=2Ec
>> @@ -1136,6 +1136,7 @@ static int build_initial_monmap(struct ceph_mon_c=
lient *monc)
>>   			       GFP_KERNEL);
>>   	if (!monc->monmap)
>>   		return -ENOMEM;
>> +	monc->monmap->num_mon =3D num_mon;
>>     	for (i =3D 0; i < num_mon; i++) {
>>   		struct ceph_entity_inst *inst =3D &monc->monmap->mon_inst[i];
>> @@ -1147,7 +1148,6 @@ static int build_initial_monmap(struct ceph_mon_c=
lient *monc)
>>   		inst->name=2Etype =3D CEPH_ENTITY_TYPE_MON;
>>   		inst->name=2Enum =3D cpu_to_le64(i);
>>   	}
>> -	monc->monmap->num_mon =3D num_mon;
>
>BTW, is this change related ?

Yes, this is needed so that the __counted_by size is set before accessing =
the flexible array=2E

>
>>   	return 0;
>>   }
>>  =20
>
>Else LGTM=2E
>
>Reviewed-by: Xiubo Li <xiubli@redhat=2Ecom>

Thanks!


--=20
Kees Cook