From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757820AbcASU7W (ORCPT ); Tue, 19 Jan 2016 15:59:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39119 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757537AbcASU7R (ORCPT ); Tue, 19 Jan 2016 15:59:17 -0500 Subject: Re: [patch] IB/cma: allocating too much memory in make_cma_ports() To: Matan Barak , Dan Carpenter References: <20160112092921.GB29804@mwanda> Cc: Sean Hefty , Hal Rosenstock , Matan Barak , linux-rdma , Linux Kernel , kernel-janitors@vger.kernel.org From: Doug Ledford Openpgp: id=AE6B1BDA122B23B4265B1274B826A3330E572FDD; url=pgp.mit.edu Organization: Red Hat, Inc. Message-ID: <569EA3A3.5080105@redhat.com> Date: Tue, 19 Jan 2016 15:59:15 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="0lcCE47kENjhicin0fW5G06J4v6lhmKWk" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --0lcCE47kENjhicin0fW5G06J4v6lhmKWk Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 01/12/2016 08:08 AM, Matan Barak wrote: > On Tue, Jan 12, 2016 at 11:29 AM, Dan Carpenter > wrote: >> The issue here is that there is a cut and paste bug. When we allocate= >> cma_dev_group->default_ports_group we use "sizeof(*cma_dev_group->port= s)" >> instead of "sizeof(*cma_dev_group->default_ports_group)". >> >> We're bumping up against the 80 character limit so I introduced a new >> local pointer "ports_group" to get around that. >> >> Fixes: 045959db65c6 ('IB/cma: Add configfs for rdma_cm') >> Signed-off-by: Dan Carpenter >> --- >> Not tested. >> >> diff --git a/drivers/infiniband/core/cma_configfs.c b/drivers/infiniba= nd/core/cma_configfs.c >> index bd1d640..18b112a 100644 >> --- a/drivers/infiniband/core/cma_configfs.c >> +++ b/drivers/infiniband/core/cma_configfs.c >> @@ -158,6 +158,7 @@ static int make_cma_ports(struct cma_dev_group *cm= a_dev_group, >> unsigned int i; >> unsigned int ports_num; >> struct cma_dev_port_group *ports; >> + struct config_group **ports_group; >> int err; >> >> ibdev =3D cma_get_ib_dev(cma_dev); >> @@ -168,12 +169,9 @@ static int make_cma_ports(struct cma_dev_group *c= ma_dev_group, >> ports_num =3D ibdev->phys_port_cnt; >> ports =3D kcalloc(ports_num, sizeof(*cma_dev_group->ports), >> GFP_KERNEL); >> + ports_group =3D kcalloc(ports_num + 1, sizeof(*ports_group), G= FP_KERNEL); >> >> - cma_dev_group->default_ports_group =3D kcalloc(ports_num + 1, >> - sizeof(*cma_dev_g= roup->ports), >> - GFP_KERNEL); >> - >> - if (!ports || !cma_dev_group->default_ports_group) { >> + if (!ports || !ports_group) { >> err =3D -ENOMEM; >> goto free; >> } >> @@ -187,15 +185,16 @@ static int make_cma_ports(struct cma_dev_group *= cma_dev_group, >> config_group_init_type_name(&ports[i].group, >> port_str, >> &cma_port_group_type); >> - cma_dev_group->default_ports_group[i] =3D &ports[i].gr= oup; >> + ports_group[i] =3D &ports[i].group; >> } >> - cma_dev_group->default_ports_group[i] =3D NULL; >> + ports_group[i] =3D NULL; >> + cma_dev_group->default_ports_group =3D ports_group; >> cma_dev_group->ports =3D ports; >> >> return 0; >> free: >> kfree(ports); >> - kfree(cma_dev_group->default_ports_group); >> + kfree(ports_group); >> cma_dev_group->ports =3D NULL; >> cma_dev_group->default_ports_group =3D NULL; >> return err; >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-rdma" = in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html >=20 > Hi, >=20 > This is already fixed in [1]. > Anyway, I'm fine with either one of them. >=20 > Acked-by: Matan Barak >=20 > Regards, > Matan >=20 > [1] http://www.spinics.net/lists/linux-rdma/msg32152.html >=20 Thanks, applied. --=20 Doug Ledford GPG KeyID: 0E572FDD --0lcCE47kENjhicin0fW5G06J4v6lhmKWk Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBCAAGBQJWnqOjAAoJELgmozMOVy/dDsgP/13T7uARtNVjvUu0hZ7IbV8P 331yZHL4aZZXlifOPjJwOTdGJsw7WS0p/2A/JdpZ4qYNL6qVFv1AI9H4rUBk4q74 1Ad1UB3DG7PD+fE2o0D0LIGFB/pjYORHHRepwp2arDOLrvwC6BiRnfMdU1MuYg6W 85IUDUXcfRaCt78gnn0e45ugf4zVqLkqnBfZVE9ksHHzQ2v7T0JxzGGkj89YvC8E qn9CRt0tFHh+Fesffy+vRsXg2RK74D5wk2Yo+OaR3emHe9cmpKNlRsMzCFQQ831I RSimpVWe/AgLL9w30LGJbptbwydzh3t5BsJrnTrcoD65bfBKPUFyvMGkTBz9A5Ue aHZyhbTNhxRB6/owgxvH/Mct6AezkROQYJ9aY7PEY7FMPVbjJobbh0h3YGcS5rYM wLBZCBHK5qZ0Bv5nz2SKyRqsqJVLK1XOrCM3ajzpvBbrzY2SBuutSYjQmU/6i40B tDVupIbPH4/+pMHBdUMrEaFj1e343BnDuMbYGE2iJzz4OkyFl6tr+AV9FqBgPyX9 aTXfytqYdw8byHpXWgN2eRxzPmxKQznM2Ggirx9gjVaKtI8W5rdt20+q8EVgJSid 6S599Oop1eVXwNc5N0ArqeRSeSTTA4+qIHpZFa9jI7dNQJDh4tu75u05L1pMUkhz NgaXPpZ5uKLZKwSGyQ4E =OgvA -----END PGP SIGNATURE----- --0lcCE47kENjhicin0fW5G06J4v6lhmKWk--