Message-ID: <555a3e2b-3981-672d-c6cf-5ecb357d2fa6@oracle.com>
Date:   Mon, 3 Jan 2022 10:43:35 -0800
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.4.1
Subject: Re: [PATCH] af_unix: missing lock releases in af_unix.c
Content-Language: en-US
To:     Ryan Cai <ycaibb@gmail.com>, davem@davemloft.net, kuba@kernel.org,
        ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org,
        kafai@fb.com, songliubraving@fb.com, yhs@fb.com,
        john.fastabend@gmail.com, kpsingh@kernel.org,
        cong.wang@bytedance.com, viro@zeniv.linux.org.uk,
        edumazet@google.com, jiang.wang@bytedance.com,
        christian.brauner@ubuntu.com, kuniyu@amazon.co.jp
Cc:     netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        bpf@vger.kernel.org
References: <20220103135830.59118-1-ycaibb@gmail.com>
From:   Shoaib Rao <rao.shoaib@oracle.com>
In-Reply-To: <20220103135830.59118-1-ycaibb@gmail.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cUNxV1Q4dzRrU0pLdHpiR0o0ZTc1VzNMYUIxdW5sTFdHaVlDQmdpSnJVQ2lZ?=
 =?utf-8?B?TkFmZExoL0dCblFmWENmdHhRUXQzSS8yem1LM2dlZXJoOFhaMkt6Njd5dTF6?=
 =?utf-8?B?LzEvK1lnbTV1S01Ud25oT0wwOS9uUUZ6OWJEMlNWbWh6TUFUaGNOclJnWHlH?=
 =?utf-8?B?b2crZFhONHFUb0hnU29PRUtZWlVpV0RZRWZiVnliTFNaQm9IOUZjNVNkWGhv?=
 =?utf-8?B?NVpna2l3MVhtYmRiUVAxUUF6eC9aQXRSeEJLVXVYM2ZLeU84TndYeDM5N1Bl?=
 =?utf-8?B?NWhNYlFnUmE0RkFZMUJJbGp2Q2grNWtCeEJpNXc2UzZ2c1UvUHBJZjl4U2s1?=
 =?utf-8?B?bGowWnNvT1B6YWtQY0dvY2FPU2J2ZnRXVjdsN1BsaHFpdTdRUXk0eEI0Y0F6?=
 =?utf-8?B?cTQ2QlZlZ05iVmpIZ0hQRkZnTStTRjI0bUFMblEyQWVpQzhhMDJ2b0xHVnNO?=
 =?utf-8?B?QmlWa1ord2xGQzczQXVnRHNZSjV0V2Jrbnd5SlNHK25OdTMzUFNKekNLWGY1?=
 =?utf-8?B?Z1dVMjFtb2JwSGpaSzBNTlp4NHdrM3FlWDJkQnpzRE9CKzFvd0pEZEU1TU80?=
 =?utf-8?B?a3VqL2RJZmRXNGo0andlTXIrWFduZjhpcWRzWnZDWDBCSlYxNlJyc3RTQnBH?=
 =?utf-8?B?NWhaNjR5NVNoZ2RzcEhZdTFGTmRyZ0o2T0pRQVZqUmh5U2xWK2RhTVhOTzFQ?=
 =?utf-8?B?NmFQbnJmOXJGdkRwNERMbm5RQm1nUzNsaWtSK1JDMGg3T000cUFWM052SmVO?=
 =?utf-8?B?b2ZPYnBnL081UkZBT1g2LzNkdUFGRkVub0pvM0lrWG5aUWtoRGxTcUMzK1VB?=
 =?utf-8?B?Ull6L3JGVnpqUjhQTE0reDZkMGszWlI1aVRjOCs2K0dTU2F6dnV1UFpnd0Rt?=
 =?utf-8?B?WW5ZNlpHSmY2bUdDNEZhRHlWaUJoTWZvL3dmYm5XdUgzaXd1dGZWYzBZNEJ5?=
 =?utf-8?B?WVhPR0IzV2hXbDl4aHVMRTVIOCtnTFh0QlFxZjBON2d4ZHVFYnRrV1ZoOFpI?=
 =?utf-8?B?NEd3S0xLNnBPY0Vuanp4anZxUXFCaFBrUFk0d25zYkhFM0QrdnU0RHBpV242?=
 =?utf-8?B?Z0dKQUl0Ymw5RWdiZmM1SWtVekFqWTN3SEMxRWdtM0ZoWlBHZVQwTm9ndXhJ?=
 =?utf-8?B?RExnOWV6aHVWL3NhNjE0RnByOHljOVBkUkdaNUV0SktibnB5am1HV3I1OWgw?=
 =?utf-8?B?ZlpkTVZlcUV3bG1xNzkrRzZ2R1hTM0hsRHZnZkdQczJlM2tJdG1ZY1VLZ3or?=
 =?utf-8?B?YzBNQnY4V3oxaW9LZ3REMmlsRjRUT3JVNXkyVkhXZEdBVnVBdGZZeFpkczlQ?=
 =?utf-8?B?RVh4Q1F5OWtHUFZ2OXFZbTMwZ2pPN2d5VG9IWUxLRjZWSWNMOGUxNHFtbXBJ?=
 =?utf-8?B?ZGFXTlVwSUhoMUZFbEVGS3JzZFQ1ZHdLd0oxRmFmc0VBa0R2RU83QTNMTk5W?=
 =?utf-8?B?c2NJQXFaeWtaTGdWenI5NWVTNWd4cVFsbDBtZ1UvdkZyY2QxTGdlWGRtVVNy?=
 =?utf-8?B?RWhXZHhxUzFqSlFSMXJ5WlI3S0pSanV6VnI0YTRaMzNEVnA3M3JsYXYwaVU2?=
 =?utf-8?B?cnhLaE5HaDZTTFplUlkwWk11c2ltYUpZR3B1dmpEbTdnL1hOZURwNk45MXdZ?=
 =?utf-8?B?ODFoN3IwZmtRUTBidS8yK3FwaDJtN1RSVlBOa2NYUzdJOEl3a3AxNExEN0pL?=
 =?utf-8?B?c3oxMXJ1Q1pEelBGSnpKZkk0YURDSVRmbnB1Y2FqYis1d0lHTEk4cys4RktI?=
 =?utf-8?B?TjltRngvNHdpTXFmZWlubHkvdXN3d0pRaHZPTWQrc3F1b2FBU0tkOEFucm93?=
 =?utf-8?B?VUFScjRxdnMzK2RkQjk5NFo5YXFDTFJ1WTJWQVNBN2Q3bnJuSHd0d2lua2Na?=
 =?utf-8?B?SHdYQWhlcnFFZU1MUUxCaGc3SzZLU2ZBRGhGSUIzUk1VaDRrQk9Tay9NU2VI?=
 =?utf-8?B?S0xVSHEvUUF3YWdFdFJJRXZTWUJQdTRONU0xaTNicTR5c3cyY1doWlZaeWFW?=
 =?utf-8?B?RUVVa21aRjJlNmRXUXBsd09NNUNLazdxL0JTa3pDUEdndnRPWGpWSjgxcGFk?=
 =?utf-8?B?R0gra2gxZjhheEN4MkdGbWdtbU1reG5iS0VNcGhSZ3VqakpQeHhJQThaMDg2?=
 =?utf-8?B?WUVUdDNiNzRadWJYNFVRck9tZnE4QVZOUUVrY1p2VDZIb3ZFZkxlalRhT3Fa?=
 =?utf-8?Q?b31OJTjz/pYTT6CmeeezUkOzQtpWwDLcKuTRycUSW0kH?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1fd616cb-a2f7-4456-f5f9-08d9cee97c1a
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4494.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2022 18:47:26.0560
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: kZVDi/RIKA607nuVBRGI/k4Vlq109cNZlMr5hFtgGZLKEUyS5TfxDAthcIzvYgwGr1uGhgJQ1r4pWIiWMRmGLw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB4637
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10216 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxscore=0 bulkscore=0
 spamscore=0 adultscore=0 phishscore=0 mlxlogscore=999 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000
 definitions=main-2201030127
X-Proofpoint-GUID: n8GKkUcUUsyCkkcATQ18VEuaQ8Lmbsjv
X-Proofpoint-ORIG-GUID: n8GKkUcUUsyCkkcATQ18VEuaQ8Lmbsjv
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 1/3/22 05:58, Ryan Cai wrote:
> In method __unix_dgram_recvmsg, the lock u->iolock is not released when skb is true and loop breaks.
>
> Signed-off-by: Ryan Cai <ycaibb@gmail.com>
> ---
>   net/unix/af_unix.c | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
> index b0bfc78e421c..b97972948d9d 100644
> --- a/net/unix/af_unix.c
> +++ b/net/unix/af_unix.c
> @@ -2305,6 +2305,7 @@ int __unix_dgram_recvmsg(struct sock *sk, struct msghdr *msg, size_t size,
>   		if (skb) {
>   			if (!(flags & MSG_PEEK))
>   				scm_stat_del(sk, skb);
> +			mutex_unlock(&u->iolock);
>   			break;
>   		}
>   

It seems to me that the unlock at the end will release the mutex?

out_free:
         skb_free_datagram(sk, skb);
         mutex_unlock(&u->iolock);

Shoaib