Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Martin Lau <kafai@fb.com>
To:     zerons <sironhide0null@gmail.com>
CC:     "ast@kernel.org" <ast@kernel.org>,
        "daniel@iogearbox.net" <daniel@iogearbox.net>,
        "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] bpf: decrease usercnt if bpf_map_new_fd() fails in
 bpf_map_get_fd_by_id()
Thread-Topic: [PATCH] bpf: decrease usercnt if bpf_map_new_fd() fails in
 bpf_map_get_fd_by_id()
Thread-Index: AQHUzd3KjJLq1K7Rq0CzDeaiSl5dPqXyVymA
Date:   Tue, 26 Feb 2019 17:33:58 +0000
Message-ID: <20190226173355.chm6gwvwyer57yco@kafai-mbp.dhcp.thefacebook.com>
References: <1551190537-28694-1-git-send-email-sironhide0null@gmail.com>
In-Reply-To: <1551190537-28694-1-git-send-email-sironhide0null@gmail.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-originating-ip: [2620:10d:c090:200::3:406f]
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: 23252ffe-8c4e-4c99-1893-08d69c109660
x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020);SRVR:MWHPR15MB1245;
x-ms-traffictypediagnostic: MWHPR15MB1245:
x-microsoft-exchange-diagnostics: 1;MWHPR15MB1245;20:4FgjTAymnC1VstydjuR+Uiw4LXKmdUrpSH08qDATQZNRvfC+ax6CTOlfvUbEmYl+JL6B1UuOs64wgwivW0p0U+DNXJKy6tzTWBKrNobUDvIEcCK/piZYF0Ntau4moJ1B4ePGGPuASldLSIFgBRpYSpz47I+TN4eyh5GdzWoM7HI=
x-microsoft-antispam-prvs: <MWHPR15MB1245111E99C3E572044F9710D57B0@MWHPR15MB1245.namprd15.prod.outlook.com>
x-forefront-prvs: 096029FF66
x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(346002)(376002)(136003)(366004)(39860400002)(189003)(51914003)(199004)(256004)(14454004)(229853002)(99286004)(71190400001)(71200400001)(106356001)(86362001)(105586002)(1411001)(6506007)(6486002)(386003)(1076003)(2906002)(6436002)(76176011)(102836004)(7736002)(25786009)(52116002)(305945005)(9686003)(6512007)(6246003)(186003)(6116002)(4744005)(81166006)(476003)(11346002)(8676002)(81156014)(446003)(53936002)(46003)(68736007)(478600001)(8936002)(6916009)(4326008)(54906003)(97736004)(5660300002)(316002)(486006);DIR:OUT;SFP:1102;SCL:1;SRVR:MWHPR15MB1245;H:MWHPR15MB1790.namprd15.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1;
received-spf: None (protection.outlook.com: fb.com does not designate
 permitted sender hosts)
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam-message-info: 9CtZvayAHKoRx95nvoXSEmT2m1RL7y0ocoOqF/6d0Rd2cjPxv/UUy/xEaItsxuHrsPf5RT1PxDwvd+wxqpFzxZGyZB2m1PCwqydcQUj5eff1PuqpjzC3DSmM/7pdJJ9ohzeKO1XOWXgRKDhiHQJ8sxpTX25vUwVwEwX06xVptV+MhBYgcukSrGAugdHpkHN97orAXFRLfZw81pT75FvyKHAPDCInA7kM8fsU1v396f7HFDoHI1b7IzPXwAePjfxruV6lp1uO0GyIm1sRERPJwvngtJusphkYZ66TZ34T8fYVNQm3Gyk156VALaTKEBlkdu52f1DsFDJjMeWKsO0Fylxb3AM5jFbomdz7QbuFhDIT+jwLs3e9nZQwNSw/+EiWNLWskXB+QLYz5z7SiG9CKn34Y/Un5lTDlJLdR6TnAFA=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <48943E76A5B1CD48BC92A53BA2C83EB7@namprd15.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 23252ffe-8c4e-4c99-1893-08d69c109660
X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Feb 2019 17:33:57.0799
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR15MB1245
X-OriginatorOrg: fb.com
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-02-26_10:,,
 signatures=0
X-Proofpoint-Spam-Reason: safe
X-FB-Internal: Safe
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, Feb 26, 2019 at 10:15:37PM +0800, zerons wrote:
> [ Upstream commit c91951f15978f1a0c6b65f063d30f7ea7bc6fb42 ]
>=20
> In bpf/syscall.c, bpf_map_get_fd_by_id() use bpf_map_inc_not_zero() to in=
crease
> the refcount, both map->refcnt and map->usercnt. Then, if bpf_map_new_fd(=
) fails,
> should handle map->usercnt too.
Good catch!  Thanks for the fix.

Fixes: bd5f5f4ecb78 ("bpf: Add BPF_MAP_GET_FD_BY_ID")
Acked-by: Martin KaFai Lau <kafai@fb.com>